turn unavail colors in selector into non-clickable flat images

(instead of making them all buttons)

API.md

@@ -28,7 +28,9 @@ minetest.register_node("mymod:colored_node", {
 - "unifieddyes_palette_colorwallmounted.png"
 - or one of the "split" hues palettes (see below).
 
-`groups`: If your node can be colored by punching it with dye, its groups entry must contain the key ud_param2_colorable = 1, among whatever else you'd normally put there. If the node is software-controlled, as might be the case for some mesecons-digilines aware node, then this group key should be omitted.
+`groups`: If your node can be colored by using the airbrush, its groups entry must contain the key ud_param2_colorable = 1, among whatever else you'd normally put there. If the node is software-controlled, as might be the case for some mesecons-digilines aware node, then this group key should be omitted.
+
+If your node if of the kind where you need the split palette, but you need to put the *full color name* into the node name, as opposed to just the hue, then add the keys `ud_color_start` and `ud_color_end` and set them to the positions of the first and last characters of the color name (where 1 is the first character of the mod name at the start of the node name, i.e. "mymod:foo_bar_orange_baz" would have the start set to 15 and the end at 20).
 
 `on_construct`: see below.
 
@@ -53,7 +55,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`.
 
@@ -67,46 +69,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.
 
-**`unifieddyes.make_colored_itemstack(itemstack, palette, color)`**
+**`unifieddyes.register_color_craft(recipe)`**
 
-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).
+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:
-
-#### 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:
-
-```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({
@@ -127,17 +113,59 @@ 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 set to the output item to `output_prefix` + (hue) + `output_suffix` + `output`.  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.  In this situation, you can set `output` to your recipe yield (with a leading space) if needed.  For example, if the prefix is "foo:bar", the suffix is "baz", and the output is set to " 3", then the craft helper will generate output item strings of the form "foo:bar_COLOR_baz 3", for each color in the table.
+
+**`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).
+
+**`unifieddyes.generate_split_palette_nodes(name, def, drop)`**
+
+Does just what it sounds like - it registers all the nodes that are needed for a given base node (`def`) to be able to use the split palette, each named according to `name`, with the palette hue appended.  If a custom drop is needed, it can be passed along (only a string is allowed here, specifying a single item).  
+
+
+#### 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:
 
@@ -152,8 +180,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, and you wish to expand it accordingly, follow the above "never used" section, skipping the "remove/delete this and that" items, and of course omitting the LBM.
+**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.

colors.txt

@@ -1,90 +0,0 @@
-
-
-Full-saturation colors:
------------------------
-
-dark aqua                          0, 84, 42  unifieddyes_dark_aqua.png
-dark blue                          0,  0, 84  unifieddyes_dark_blue.png
-dark cyan                          0, 84, 83  unifieddyes_dark_cyan.png
-dark green                         0, 84,  0  unifieddyes_dark_green.png
-dark lime                         43, 84,  0  unifieddyes_dark_lime.png
-dark magenta                      84,  0, 83  unifieddyes_dark_magenta.png
-dark orange                       84, 42,  0  unifieddyes_dark_orange.png
-dark red                          84,  0,  0  unifieddyes_dark_red.png
-dark redviolet                    84,  0, 42  unifieddyes_dark_redviolet.png
-dark skyblue                       0, 42, 84  unifieddyes_dark_skyblue.png
-dark violet                       43,  0, 84  unifieddyes_dark_violet.png
-dark yellow                       84, 83,  0  unifieddyes_dark_yellow.png
-medium aqua                        0,169, 84  unifieddyes_medium_aqua.png
-medium blue                        0,  0,169  unifieddyes_medium_blue.png
-medium cyan                        0,169,167  unifieddyes_medium_cyan.png
-medium green                       0,169,  0  unifieddyes_medium_green.png
-medium lime                       87,169,  0  unifieddyes_medium_lime.png
-medium magenta                   169,  0,167  unifieddyes_medium_magenta.png
-medium orange                    169, 84,  0  unifieddyes_medium_orange.png
-medium red                       168,  0,  0  unifieddyes_medium_red.png
-medium redviolet                 169,  0, 84  unifieddyes_medium_redviolet.png
-medium skyblue                     0, 84,169  unifieddyes_medium_skyblue.png
-medium violet                     87,  0,169  unifieddyes_medium_violet.png
-medium yellow                    169,167,  0  unifieddyes_medium_yellow.png
-aqua                               1,255,127  unifieddyes_aqua.png
-blue                               1,  1,255  unifieddyes_blue.png
-cyan                               1,255,252  unifieddyes_cyan.png
-green                              1,255,  1  unifieddyes_green.png
-lime                             132,255,  1  unifieddyes_lime.png
-magenta                          255,  1,252  unifieddyes_magenta.png
-orange                           255,127,  1  unifieddyes_orange.png
-red                              255,  0,  0  unifieddyes_red.png
-redviolet                        255,  1,127  unifieddyes_redviolet.png
-skyblue                            1,127,255  unifieddyes_skyblue.png
-violet                           132,  1,255  unifieddyes_violet.png
-yellow                           255,252,  1  unifieddyes_yellow.png
-
-Low-saturation colors:
-----------------------
-
-dark aqua 50% saturation          21, 63, 42  unifieddyes_dark_aqua_s50.png
-dark blue 50% saturation          21, 21, 63  unifieddyes_dark_blue_s50.png
-dark cyan 50% saturation          21, 63, 63  unifieddyes_dark_cyan_s50.png
-dark green 50% saturation         21, 63, 21  unifieddyes_dark_green_s50.png
-dark lime 50% saturation          43, 63, 21  unifieddyes_dark_lime_s50.png
-dark magenta 50% saturation       63, 21, 63  unifieddyes_dark_magenta_s50.png
-dark orange 50% saturation        63, 42, 21  unifieddyes_dark_orange_s50.png
-dark red 50% saturation           63, 21, 21  unifieddyes_dark_red_s50.png
-dark redviolet 50% saturation     63, 21, 42  unifieddyes_dark_redviolet_s50.png
-dark skyblue 50% saturation       21, 42, 63  unifieddyes_dark_skyblue_s50.png
-dark violet 50% saturation        43, 21, 63  unifieddyes_dark_violet_s50.png
-dark yellow 50% saturation        63, 63, 21  unifieddyes_dark_yellow_s50.png
-medium aqua 50% saturation        42,126, 84  unifieddyes_medium_aqua_s50.png
-medium blue 50% saturation        42, 42,126  unifieddyes_medium_blue_s50.png
-medium cyan 50% saturation        42,126,126  unifieddyes_medium_cyan_s50.png
-medium green 50% saturation       42,126, 42  unifieddyes_medium_green_s50.png
-medium lime 50% saturation        86,126, 42  unifieddyes_medium_lime_s50.png
-medium magenta 50% saturation    126, 42,126  unifieddyes_medium_magenta_s50.png
-medium orange 50% saturation     126, 84, 42  unifieddyes_medium_orange_s50.png
-medium red 50% saturation        127, 42, 42  unifieddyes_medium_red_s50.png
-medium redviolet 50% saturation  126, 42, 84  unifieddyes_medium_redviolet_s50.png
-medium skyblue 50% saturation     42, 84,126  unifieddyes_medium_skyblue_s50.png
-medium violet 50% saturation      86, 42,126  unifieddyes_medium_violet_s50.png
-medium yellow 50% saturation     126,126, 42  unifieddyes_medium_yellow_s50.png
-aqua 50% saturation               65,191,127  unifieddyes_aqua_s50.png
-blue 50% saturation               65, 65,191  unifieddyes_blue_s50.png
-cyan 50% saturation               65,191,190  unifieddyes_cyan_s50.png
-green 50% saturation              65,191, 65  unifieddyes_green_s50.png
-lime 50% saturation              130,191, 65  unifieddyes_lime_s50.png
-magenta 50% saturation           191, 65,190  unifieddyes_magenta_s50.png
-orange 50% saturation            191,127, 65  unifieddyes_orange_s50.png
-red 50% saturation               192, 64, 64  unifieddyes_red_s50.png
-redviolet 50% saturation         191, 65,127  unifieddyes_redviolet_s50.png
-skyblue 50% saturation            65,127,191  unifieddyes_skyblue_s50.png
-violet 50% saturation            130, 65,191  unifieddyes_violet_s50.png
-yellow 50% saturation            191,190, 65  unifieddyes_yellow_s50.png
-
-Greyscale:
-----------
-
-black                              0,  0,  0  unifieddyes_black.png
-dark grey                         64, 64, 64  unifieddyes_darkgrey_paint.png
-medium grey                      128,128,128  unifieddyes_grey_paint.png
-light grey                       192,192,192  unifieddyes_lightgrey_paint.png
-white                            255,255,255  unifieddyes_white_paint.png

init.lua

@@ -41,23 +41,6 @@ else
 	S = function(s) return s end
 end
 
--- helper functions for other mods that use this one
-
-unifieddyes.HUES = {
-	"red",
-	"orange",
-	"yellow",
-	"lime",
-	"green",
-	"aqua",
-	"cyan",
-	"skyblue",
-	"blue",
-	"violet",
-	"magenta",
-	"redviolet"
-}
-
 -- the names of the various colors here came from http://www.procato.com/rgb+index/
 
 unifieddyes.HUES_EXTENDED = {
@@ -87,6 +70,13 @@ unifieddyes.HUES_EXTENDED = {
 	{ "crimson",    0xff, 0x00, 0x40 }
 }
 
+unifieddyes.HUES_WITH_GREY = {}
+
+for _,i in ipairs(unifieddyes.HUES_EXTENDED) do
+	table.insert(unifieddyes.HUES_WITH_GREY, i[1])
+end
+table.insert(unifieddyes.HUES_WITH_GREY, "grey")
+
 unifieddyes.HUES_WALLMOUNTED = {
 	"red",
 	"orange",
@@ -155,6 +145,9 @@ local default_dyes = {
 
 unifieddyes.player_current_dye = {}
 unifieddyes.player_selected_dye = {}
+unifieddyes.player_last_right_clicked = {}
+unifieddyes.palette_has_color = {}
+unifieddyes.player_showall = {}
 
 -- if a node with a palette is placed in the world,
 -- but the itemstack used to place it has no palette_index (color byte),
@@ -179,7 +172,7 @@ minetest.register_on_placenode(
 				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
+			else  -- it's a split palette
 				param2 = newnode.param2 % 32
 			end
 
@@ -198,6 +191,35 @@ end
 function unifieddyes.after_dig_node(foo)
 end
 
+-- This helper function creates multiple copies of the passed node,
+-- for the split palette - one per hue, plus grey - and assigns
+-- proper palettes and other attributes
+
+function unifieddyes.generate_split_palette_nodes(name, def, drop)
+	for _, color in ipairs(unifieddyes.HUES_WITH_GREY) do
+		local def2 = table.copy(def)
+		local desc_color = string.gsub(string.upper(string.sub(color, 1, 1))..string.sub(color, 2), "_", " ")
+		if string.sub(def2.description, -1) == ")" then
+			def2.description = string.sub(def2.description, 1, -2)..", "..desc_color.." shades)"
+		else
+			def2.description = def2.description.."("..desc_color.." shades)"
+		end
+		def2.palette = "unifieddyes_palette_"..color.."s.png"
+		def2.paramtype2 = "colorfacedir"
+		def2.groups.ud_param2_colorable = 1
+
+		if drop then
+			def2.drop = {
+				items = {
+					{items = {drop.."_"..color}, inherit_color = true },
+				}
+			}
+		end
+
+		minetest.register_node(":"..name.."_"..color, def2)
+	end
+end
+
 -- This helper function creates a colored itemstack
 
 function unifieddyes.make_colored_itemstack(item, palette, color)
@@ -207,24 +229,17 @@ function unifieddyes.make_colored_itemstack(item, palette, color)
 	return stack:to_string(),paletteidx
 end
 
--- if your node was once 89-color and uses an LBM to convert to the 256-color palette,
--- call this in that node def's on_construct:
-
-function unifieddyes.on_construct(pos)
-	local meta = minetest.get_meta(pos)
-	meta:set_string("palette", "ext")
-end
-
 -- these helper functions register all of the recipes needed to create colored
 -- nodes with any of the dyes supported by that node's palette.
 
-local function register_c(craft, hue, sat, val)
+local function register_c(craft, h, sat, val)
+	local hue = (type(h) == "table") and h[1] or h
 	local color = ""
 	if val then
-		if craft.palette ~= "extended" then
+		if craft.palette == "wallmounted" then
 			color = val..hue..sat
 		else
-			color = val..hue[1]..sat
+			color = val..hue..sat
 		end
 	else
 		color = hue -- if val is nil, then it's grey.
@@ -236,18 +251,19 @@ local function register_c(craft, hue, sat, val)
 	recipe = string.gsub(recipe, "NEUTRAL_NODE", craft.neutral_node)
 	local newrecipe = minetest.deserialize(recipe)
 
-	local output = craft.output
+	local coutput = craft.output or ""
+	local output = coutput
 	if craft.output_prefix then
-		if craft.palette ~= true then
+		if craft.palette ~= "split" then
-			output = craft.output_prefix..color..craft.output_suffix
+			output = craft.output_prefix..color..craft.output_suffix..coutput
 		else
 			if hue == "white" or hue == "black" or string.find(hue, "grey") then
-				output = craft.output_prefix.."grey"..craft.output_suffix
+				output = craft.output_prefix.."grey"..craft.output_suffix..coutput
 			elseif hue == "pink" then
 				dye = "dye:light_red"
-				output = craft.output_prefix.."red"..craft.output_suffix
+				output = craft.output_prefix.."red"..craft.output_suffix..coutput
 			else
-				output = craft.output_prefix..hue..craft.output_suffix
+				output = craft.output_prefix..hue..craft.output_suffix..coutput
 			end
 		end
 	end
@@ -264,19 +280,18 @@ local function register_c(craft, hue, sat, val)
 end
 
 function unifieddyes.register_color_craft(craft)
-	local hues_table = unifieddyes.HUES
+	local hues_table = unifieddyes.HUES_EXTENDED
 	local sats_table = unifieddyes.SATS
 	local vals_table = unifieddyes.VALS
 	local greys_table = unifieddyes.GREYS
 
 	if craft.palette == "wallmounted" then
 		register_c(craft, "green", "", "light_")
-		register_c(craft, "azure", "", "")
+		register_c(craft, "blue", "", "light_")
 		hues_table = unifieddyes.HUES_WALLMOUNTED
 		sats_table = {""}
 		vals_table = unifieddyes.VALS
 	elseif craft.palette == "extended" then
-		hues_table = unifieddyes.HUES_EXTENDED
 		vals_table = unifieddyes.VALS_EXTENDED
 		greys_table = unifieddyes.GREYS_EXTENDED
 	end
@@ -361,10 +376,10 @@ end
 function unifieddyes.get_hsv(name) -- expects a node/item name
 	local hue = ""
 	local a,b
-	for _, i in ipairs(unifieddyes.HUES) do
+	for _, i in ipairs(unifieddyes.HUES_EXTENDED) do
-		a,b = string.find(name, "_"..i)
+		a,b = string.find(name, "_"..i[1])
-		if a and not ( string.find(name, "_redviolet") and i == "red" ) then
+		if a then
-			hue = i
+			hue = i[1]
 			break
 		end
 	end
@@ -394,10 +409,10 @@ end
 -- in the function below, color is just a color string, while
 -- palette_type can be:
 --
--- false/nil = standard 89 color palette
--- true = 89 color palette split into pieces for colorfacedir
--- "wallmounted" = 32-color abridged palette
 -- "extended" = 256 color palette
+-- "split" = 200 color palette split into pieces for colorfacedir
+-- "wallmounted" = 32-color abridged palette
+
 
 function unifieddyes.getpaletteidx(color, palette_type)
 
@@ -446,21 +461,6 @@ function unifieddyes.getpaletteidx(color, palette_type)
 		["black"] = 4,
 	}
 
-	local hues = {
-		["red"] = 1,
-		["orange"] = 2,
-		["yellow"] = 3,
-		["lime"] = 4,
-		["green"] = 5,
-		["aqua"] = 6,
-		["cyan"] = 7,
-		["skyblue"] = 8,
-		["blue"] = 9,
-		["violet"] = 10,
-		["magenta"] = 11,
-		["redviolet"] = 12,
-	}
-
 	local hues_extended = {
 		["red"] = 0,
 		["vermilion"] = 1,
@@ -473,10 +473,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,
@@ -485,6 +487,7 @@ function unifieddyes.getpaletteidx(color, palette_type)
 		["magenta"] = 20,
 		["fuchsia"] = 21,
 		["rose"] = 22,
+		["redviolet"] = 22,
 		["crimson"] = 23,
 	}
 
@@ -509,6 +512,17 @@ function unifieddyes.getpaletteidx(color, palette_type)
 		["darks50"] = 7,
 	}
 
+	local shades_split = {
+		["faint"] = 0,
+		[""] = 1,
+		["s50"] = 2,
+		["light"] = 3,
+		["medium"] = 4,
+		["mediums50"] = 5,
+		["dark"] = 6,
+		["darks50"] = 7,
+	}
+
 	local shades_extended = {
 		["faint"] = 0,
 		["pastel"] = 1,
@@ -540,7 +554,7 @@ function unifieddyes.getpaletteidx(color, palette_type)
 		if grayscale_wallmounted[color] then
 			return (grayscale_wallmounted[color] * 8), 0
 		end
-	elseif palette_type == true then
+	elseif palette_type == "split" then
 		if grayscale[color] then
 			return (grayscale[color] * 32), 0
 		end
@@ -548,10 +562,6 @@ function unifieddyes.getpaletteidx(color, palette_type)
 		if grayscale_extended[color] then
 			return grayscale_extended[color]+240, 0
 		end
-	else
-		if grayscale[color] then
-			return grayscale[color], 0
-		end
 	end
 
 	local shade = "" -- assume full
@@ -583,7 +593,7 @@ function unifieddyes.getpaletteidx(color, palette_type)
 		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 == "azure" then return 40,5
+		elseif color == "blue" and shade == "light" 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
@@ -595,40 +605,14 @@ function unifieddyes.getpaletteidx(color, palette_type)
 			color = "red"
 			shade = "light"
 		end
-		if palette_type == true then -- it's colorfacedir, so "split" 89-color palette
+		if palette_type == "split" then -- it's colorfacedir
-
+			if hues_extended[color] and shades_split[shade] then
-			-- If using this palette, translate new color names back to old.
+				return (shades_split[shade] * 32), hues_extended[color]+1
-
-			if shade == "" then
-				if color == "spring" then
-					color = "aqua"
-				elseif color == "azure" then
-					color = "skyblue"
-				elseif color == "rose" then
-					color = "redviolet"
-				end
-			end
-
-			if hues[color] and shades[shade] then
-				return (shades[shade] * 32), hues[color]
 			end
 		elseif palette_type == "extended" then
 			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 regular 89-color palette, do the same translation if needed
-			if shade == "" then
-				if color == "spring" then
-					color = "aqua"
-				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]
-			end
 		end
 	end
 end
@@ -639,69 +623,103 @@ function unifieddyes.on_airbrush(itemstack, player, pointed_thing)
 	local player_name = player:get_player_name()
 	local painting_with = nil
 
-	if unifieddyes.player_current_dye[player_name] and minetest.registered_items[unifieddyes.player_current_dye[player_name]] then
+	if unifieddyes.player_current_dye[player_name] then
 		painting_with = unifieddyes.player_current_dye[player_name]
 	end
 
 	local pos = minetest.get_pointed_thing_position(pointed_thing)
-	if not pos or player:get_player_control().sneak then
+	if not pos then return end
-		unifieddyes.show_airbrush_form(player)
-		return
-	end
-
-	if not painting_with then return end
 
 	local node = minetest.get_node(pos)
 	local def = minetest.registered_items[node.name]
 	if not def then return end
 
 	if minetest.is_protected(pos, player_name) then
-		minetest.chat_send_player(player_name, "Sorry, someone else owns that node.")
+		minetest.chat_send_player(player_name, "*** Sorry, someone else owns that node.")
 		return
 	end
 
-	if not def.palette then
+	if not painting_with then
-		minetest.chat_send_player(player_name, "That node can't be colored.")
+		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 not (def.groups and def.groups.ud_param2_colorable and def.groups.ud_param2_colorable > 0) then
+		minetest.chat_send_player(player_name, "*** That node can't be colored.")
 		return
 	end
 
 	local palette = nil
 	local fdir = 0
-	if def.palette == "unifieddyes_palette_extended.png" then
+	if def.paramtype2 == "color" then
 		palette = "extended"
-	elseif def.palette == "unifieddyes_palette_colorwallmounted.png" then
+	elseif def.paramtype2 == "colorwallmounted" then
 		palette = "wallmounted"
 		fdir = node.param2 % 8
-	elseif def.palette ~= "unifieddyes_palette.png" then
+	elseif def.paramtype2 ==  "colorfacedir" then
-		palette = true
+		palette = "split"
 		fdir = node.param2 % 32
+	else
+		minetest.chat_send_player(player_name, "*** That node can't be colored -- it has an invalid color mode.")
+		return
 	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
-		minetest.chat_send_player(player_name, "You're in survival mode, and you're out of "..string.sub(painting_with, 5).."."..suff)
+		minetest.chat_send_player(player_name, "*** You're in survival mode, and you're out of "..string.sub(painting_with, 5).."."..suff)
 		return
 	end
 
 	if not idx then
-		minetest.chat_send_player(player_name, string.sub(painting_with, 5).." can't be applied to that node.")
+		minetest.chat_send_player(player_name, "*** "..string.sub(painting_with, 5).." can't be applied to that node.")
 		return
 	end
 
 	local oldidx = node.param2 - fdir
-	if idx == oldidx then
-		minetest.chat_send_player(player_name, "That node is already "..string.sub(painting_with, 5)..".")
-		return
-	end
-
 	local name = def.airbrush_replacement_node or node.name
 
+	if palette == "split" then
+
+		local modname = string.sub(name, 1, string.find(name, ":")-1)
+		local nodename2 = string.sub(name, string.find(name, ":")+1)
+		local oldcolor = "snozzberry"
+		local newcolor = "razzberry" -- intentionally misspelled ;-)
+
+		if def.ud_color_start and def.ud_color_end then
+			oldcolor = string.sub(node.name, def.ud_color_start, def.ud_color_end)
+			newcolor = string.sub(painting_with, 5)
+		else
+			if hue ~= 0 then
+				newcolor = unifieddyes.HUES_EXTENDED[hue][1]
+			else
+				newcolor = "grey"
+			end
+
+			if def.airbrush_replacement_node then
+				oldcolor = "grey"
+			else
+				local s = string.sub(def.palette, 21)
+				oldcolor = string.sub(s, 1, string.find(s, "s.png")-1)
+			end
+		end
+
+		name = modname..":"..string.gsub(nodename2, oldcolor, newcolor)
+
+		if not minetest.registered_items[name] then
+			minetest.chat_send_player(player_name, "*** "..string.sub(painting_with, 5).." can't be applied to that node.")
+			return
+		end
+	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)
@@ -709,17 +727,167 @@ function unifieddyes.on_airbrush(itemstack, player, pointed_thing)
 	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_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 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 color ~= "grey" then
+			if     v == 0 then return "faint_"..color
+			elseif 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
+
+local hps = 0.6 -- horizontal position scale
+local vps = 1.3 -- vertical position scale
+local vs = 0.3  -- vertical shift/offset
+local color_button_size = ";0.75,0.75;"
+local color_square_size = ";0.69,0.69;"
+
+function unifieddyes.make_colored_square(hexcolor, colorname, showall, creative, painting_with, nodepalette, hp, v2, selindic, inv, explist)
+
+	local dye = "dye:"..colorname
+
+	local overlay = ""
+	local colorize = minetest.formspec_escape("^[colorize:#"..hexcolor..":255")
+
+	if not creative and inv:contains_item("main", dye) then
+		overlay = "^unifieddyes_onhand_overlay.png"
+	end
+
+	local unavail_overlay = ""
+	if not showall and not unifieddyes.palette_has_color[nodepalette.."_"..colorname]
+		or (explist and not explist[colorname]) then
+		if overlay == "" then
+			unavail_overlay = "^unifieddyes_unavailable_overlay.png"
+		else
+			unavail_overlay = "^unifieddyes_onhand_unavailable_overlay.png"
+		end
+	end
+
+	if dye == painting_with then
+		overlay = "^unifieddyes_select_overlay.png"
+		selindic = "unifieddyes_white_square.png"..colorize..overlay..unavail_overlay.."]"..
+					"tooltip["..colorname..";"..colorname.."]"
+	end
+	local form
+
+	if unavail_overlay == "" then
+		form = "image_button["..
+					(hp*hps)..","..(v2*vps+vs)..
+					color_button_size..
+					"unifieddyes_white_square.png"..colorize..overlay..unavail_overlay..";"..
+					colorname..";]"..
+					"tooltip["..colorname..";"..colorname.."]"
+	else
+		form = "image["..
+					(hp*hps)..","..(v2*vps+vs)..
+					color_square_size..
+					"unifieddyes_white_square.png"..colorize..overlay..unavail_overlay.."]"..
+					"tooltip["..colorname.." (unavailable);"..colorname.."]"
+	end
+
+	return form, selindic
+end
+
 function unifieddyes.show_airbrush_form(player)
 	if not player then return end
+
+	local t = {}
+
 	local player_name = player:get_player_name()
+	local painting_with = unifieddyes.player_selected_dye[player_name] or unifieddyes.player_current_dye[player_name]
 	local creative = creative and creative.is_enabled_for(player_name)
 	local inv = player:get_inventory()
+	local nodepalette = "extended"
+	local showall = unifieddyes.player_showall[player_name]
 
-	local base_form = "size[15,8.5]label[7,-0.25;Select a color:]"
+	t[1] = "size[15,8.5]label[7,-0.25;Select a color:]"
-	local size="0.75,0.75;"
+	local selindic = "unifieddyes_select_overlay.png^unifieddyes_question.png]"
-	local hps=0.6
+
-	local vps=1.3
+	local last_right_click = unifieddyes.player_last_right_clicked[player_name]
-	local vs=0.3
+	if last_right_click then
+		if last_right_click.def and last_right_click.def.paramtype2 then
+			if last_right_click.def.paramtype2 == "colorwallmounted" then
+				nodepalette = "wallmounted"
+			elseif last_right_click.def.paramtype2 == "color" then
+				t[#t+1] = "label[0.5,8.25;(Right-clicked a node that supports all 256 colors, showing them all)]"
+				showall = true
+			elseif last_right_click.def.paramtype2 == "colorfacedir" then
+				nodepalette = "split"
+			end
+		end
+	end
+
+	if not last_right_click.def.groups or not last_right_click.def.groups.ud_param2_colorable then
+		t[#t+1] = "label[0.5,8.25;(Right-clicked a node not supported by the Airbrush, showing all colors)]"
+	end
+
+	local explist = last_right_click.def.explist
 
 	for v = 0, 6 do
 		local val = unifieddyes.VALS_EXTENDED[v+1]
@@ -745,25 +913,10 @@ function unifieddyes.show_airbrush_form(player)
 			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 hexcolor = string.format("%02x", r2)..string.format("%02x", g2)..string.format("%02x", b2)
-			local dye = "dye:"..val..hue..sat
+			local f
-			local overlay = ""
+			f, selindic = unifieddyes.make_colored_square(hexcolor, val..hue..sat, showall, creative, painting_with, nodepalette, hp, v2, selindic, inv, explist)
-			if not creative and inv:contains_item("main", dye) then
+			t[#t+1] = f
-				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
@@ -793,26 +946,10 @@ function unifieddyes.show_airbrush_form(player)
 				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 hexcolor = string.format("%02x", r3)..string.format("%02x", g3)..string.format("%02x", b3)
-				local dye = "dye:"..val..hue..sat
+				local f
-
+				f, selindic = unifieddyes.make_colored_square(hexcolor, val..hue..sat, showall, creative, painting_with, nodepalette, hp, v2, selindic, inv, explist)
-				local overlay = ""
+				t[#t+1] = f
-				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
@@ -822,57 +959,69 @@ function unifieddyes.show_airbrush_form(player)
 
 		local hp=(15-y)+0.5
 
-		local grey = string.format("%02x", y*17)..string.format("%02x", y*17)..string.format("%02x", y*17)
+		local hexgrey = string.format("%02x", y*17)..string.format("%02x", y*17)..string.format("%02x", y*17)
-		local grey2 = "grey_"..y
+		local grey = "grey_"..y
 
-		if y == 0 then grey2 = "black" 
+		if y == 0 then grey = "black" 
-		elseif y == 4 then grey2 = "dark_grey"
+		elseif y == 4 then grey = "dark_grey"
-		elseif y == 8 then grey2 = "grey"
+		elseif y == 8 then grey = "grey"
-		elseif y == 11 then grey2 = "light_grey"
+		elseif y == 11 then grey = "light_grey"
-		elseif y == 15 then grey2 = "white"
+		elseif y == 15 then grey = "white"
 		end
 
-		local dye = "dye:"..grey2
+		local f
-
+		f, selindic = unifieddyes.make_colored_square(hexgrey, grey, showall, creative, painting_with, nodepalette, hp, v2, selindic, inv, explist)
-		local overlay = ""
+		t[#t+1] = f
-		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..
+		t[#t+1] = "image[10.3,"
-				"image[10.3,"..(vps*5+vs)..";"..size..
+		t[#t+1] = (vps*5+vs)
-				"unifieddyes_available_overlay.png]"..
+		t[#t+1] = color_button_size
-				"label[11.0,"..(vps*5.1+vs)..";Dyes on hand]"..
+		t[#t+1] = "unifieddyes_onhand_overlay.png]label[11.0,"
-				"image[12.5,"..(vps*5+vs)..";"..size..
+		t[#t+1] = (vps*5.02+vs)
-				"unifieddyes_select_overlay.png]"..
+		t[#t+1] = ";Dyes]"
-				"label[13.2,"..(vps*5.1+vs)..";Your selection]"
+		t[#t+1] = "label[11.0,"
+		t[#t+1] = (vps*5.18+vs)
+		t[#t+1] = ";on hand]"
+
 	end
 
-	base_form = base_form..
+	t[#t+1] = "image[11.9,"
-				"button_exit[11,8;2,1;cancel;Cancel]"..
+	t[#t+1] = (vps*5+vs)
-				"button_exit[13,8;2,1;accept;Accept]"
+	t[#t+1] = color_button_size
+	t[#t+1] = selindic
 
-	if unifieddyes.player_selected_dye[player_name] then
+	if painting_with then
-		base_form = base_form..
+		t[#t+1] = "label[12.6,"
-					"label[1,"..(7.5+vs)..";Selected dye:  "..
+		t[#t+1] = (vps*5.02+vs)
-					unifieddyes.player_selected_dye[player_name].."]"
+		t[#t+1] = ";Your selection:]"
+		t[#t+1] = "label[12.6,"
+		t[#t+1] = (vps*5.18+vs)
+		t[#t+1] = ";"
+		t[#t+1] = painting_with
+		t[#t+1] = "]"
+	else
+		t[#t+1] = "label[12.6,"
+		t[#t+1] = (vps*5.1+vs)
+		t[#t+1] = ";Your selection]"
 	end
 
-	minetest.show_formspec(player_name, "unifieddyes:dye_select_form", base_form)
+	t[#t+1] = "button_exit[11,8;2,1;cancel;Cancel]button_exit[13,8;2,1;accept;Accept]"
+
+
+	if last_right_click and last_right_click.def and nodepalette ~= "extended" then
+		if showall then
+			t[#t+1] = "button[0.5,8;2,1;show_avail;Show Available]"
+			t[#t+1] = "label[2.5,8.25;(Currently showing all 256 colors)]"
+		else
+			t[#t+1] = "button[0.5,8;2,1;show_all;Show All Colors]"
+			t[#t+1] = "label[2.5,8.25;(Currently only showing what the right-clicked node can use)]"
+		end
+	end
+
+	minetest.show_formspec(player_name, "unifieddyes:dye_select_form", table.concat(t))
 end
 
 minetest.register_tool("unifieddyes:airbrush", {
@@ -883,7 +1032,34 @@ minetest.register_tool("unifieddyes:airbrush", {
 		full_punch_interval=0.1,
 	},
 	range = 12,
-	on_use = unifieddyes.on_airbrush
+	on_use = unifieddyes.on_airbrush,
+	on_place = function(itemstack, placer, pointed_thing)
+		local keys = placer:get_player_control()
+		local player_name = placer:get_player_name()
+		local pos = minetest.get_pointed_thing_position(pointed_thing)
+		local node
+		local def
+
+		if pos then node = minetest.get_node(pos) end
+		if node then def = minetest.registered_items[node.name] end
+
+		unifieddyes.player_last_right_clicked[player_name] = {pos = pos, node = node, def = def}
+
+		if not keys.sneak then
+			unifieddyes.show_airbrush_form(placer)
+		elseif keys.sneak then
+
+			if not pos or 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( {
@@ -896,24 +1072,68 @@ minetest.register_craft( {
 })
 
 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 nodepalette = "extended"
-		local s3 = string.sub(s1,1, string.find(s1, '"')-1)
+		local showall = unifieddyes.player_showall[player_name]
-		if s3 == "cancel" then
+
-			unifieddyes.player_selected_dye[player_name] = nil
+		local last_right_click = unifieddyes.player_last_right_clicked[player_name]
+		if last_right_click and last_right_click.def then
+			if last_right_click.def.palette then
+				if last_right_click.def.palette == "unifieddyes_palette_colorwallmounted.png" then
+					nodepalette = "wallmounted"
+				elseif last_right_click.def.palette ~= "unifieddyes_palette_extended.png" then
+					nodepalette = "split"
+				end
+			end
+		end
+
+		if fields.show_all then 
+			unifieddyes.player_showall[player_name] = true
+			unifieddyes.show_airbrush_form(player)
 			return
-		elseif s3 == "accept" and unifieddyes.player_selected_dye[player_name] then
+		elseif fields.show_avail then 
+			unifieddyes.player_showall[player_name] = false
+			unifieddyes.show_airbrush_form(player)
+			return
+		elseif fields.quit then
+			if fields.accept then
 				local dye = unifieddyes.player_selected_dye[player_name]
-			unifieddyes.player_current_dye[player_name] = dye
+				if not dye then
-			unifieddyes.player_selected_dye[player_name] = nil
+					minetest.chat_send_player(player_name, "*** Clicked \"Accept\", but no color was selected!")
-				minetest.chat_send_player(player_name, "Selected "..string.sub(dye, 5).." for the airbrush.")
+					return
+				elseif not showall
+						and not unifieddyes.palette_has_color[nodepalette.."_"..string.sub(dye, 5)] then
+					minetest.chat_send_player(player_name, "*** Clicked \"Accept\", but the selected color can't be used on the")
+					minetest.chat_send_player(player_name, "*** node that was right-clicked (and \"Show All\" wasn't in effect).")
+					if unifieddyes.player_current_dye[player_name] then
+						minetest.chat_send_player(player_name, "*** Ignoring it and sticking with "..string.sub(unifieddyes.player_current_dye[player_name], 5)..".")
+					else
+						minetest.chat_send_player(player_name, "*** Ignoring it.")
+					end
 					return
 				else
+					unifieddyes.player_current_dye[player_name] = dye
+					unifieddyes.player_selected_dye[player_name] = nil
+					minetest.chat_send_player(player_name, "*** Selected "..string.sub(dye, 5).." for the airbrush.")
+					return
+				end
+			else -- assume "Cancel" or Esc.
+				unifieddyes.player_selected_dye[player_name] = nil
+				return
+			end
+		else
+			local s1 = string.sub(minetest.serialize(fields), 11)
+			local s3 = string.sub(s1,1, string.find(s1, '"')-1)
+
 			local inv = player:get_inventory()
 			local creative = creative and creative.is_enabled_for(player_name)
 			local dye = "dye:"..s3
-			if minetest.registered_items[dye] and (creative or inv:contains_item("main", dye)) then
+
+			if (showall or unifieddyes.palette_has_color[nodepalette.."_"..s3]) and
+				(minetest.registered_items[dye] and (creative or inv:contains_item("main", dye))) then
 				unifieddyes.player_selected_dye[player_name] = dye 
 				unifieddyes.show_airbrush_form(player)
 			end
@@ -921,30 +1141,6 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 	end
 end)
 
--- build a table to convert from classic/89-color palette to extended palette
-
--- the first five entries are for the old greyscale - white, light, grey, dark, black
-unifieddyes.convert_classic_palette = {
-	240,
-	244,
-	247,
-	251,
-	253
-}
-
-for hue = 0, 11 do
-	-- light
-	local paletteidx = unifieddyes.getpaletteidx("dye:light_"..unifieddyes.HUES[hue+1], false)
-	unifieddyes.convert_classic_palette[paletteidx] = hue*2 + 48
-	for sat = 0, 1 do
-		for val = 0, 2 do
-			-- all other shades
-			local paletteidx = unifieddyes.getpaletteidx("dye:"..unifieddyes.VALS[val+1]..unifieddyes.HUES[hue+1]..unifieddyes.SATS[sat+1], false)
-			unifieddyes.convert_classic_palette[paletteidx] = hue*2 + sat*24 + (val*48+96)
-		end
-	end
-end
-
 -- Generate all dyes that are not part of the default minetest_game dyes mod
 
 for _, h in ipairs(unifieddyes.HUES_EXTENDED) do
@@ -1044,6 +1240,43 @@ minetest.register_craftitem(":dye:light_grey", {
 	groups = { dye=1, not_in_creative_inventory=1 },
 })
 
+-- build a table of color <-> palette associations to reduce the need for
+-- realtime lookups with getpaletteidx()
+
+for _, palette in ipairs({"extended", "split", "wallmounted"}) do
+	local palette2 = palette
+
+	for i in ipairs(unifieddyes.SATS) do
+		local sat = (palette == "wallmounted") and "" or unifieddyes.SATS[i]
+		for _, hue in ipairs(unifieddyes.HUES_EXTENDED) do
+			for _, val in ipairs(unifieddyes.VALS_EXTENDED) do
+				local color = val..hue[1]..sat
+				if unifieddyes.getpaletteidx("dye:"..color, palette2) then
+					unifieddyes.palette_has_color[palette.."_"..color] = true
+				end
+			end
+		end
+	end
+
+	for y = 0, 15 do
+		local grey = "grey_"..y
+
+		if y == 0 then grey = "black" 
+		elseif y == 4 then grey = "dark_grey"
+		elseif y == 8 then grey = "grey"
+		elseif y == 11 then grey = "light_grey"
+		elseif y == 15 then grey = "white"
+		end
+		if unifieddyes.getpaletteidx("dye:"..grey, palette2) then
+			unifieddyes.palette_has_color[palette.."_"..grey] = true
+		end
+	end
+end
+
+unifieddyes.palette_has_color["wallmounted_light_red"] = true
+
+-- crafting!
+
 unifieddyes.base_color_crafts = {
 	{ "red",		"flowers:rose",				nil,				nil,			nil,			nil,		4 },
 	{ "vermilion",	"dye:red",					"dye:orange",		nil,			nil,			nil,		3 },
@@ -1230,19 +1463,6 @@ 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
--- 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", "dye:spring")
-minetest.register_alias("dye:aqua", "dye:spring")
-
-minetest.register_alias("unifieddyes:skyblue", "dye:azure")
-minetest.register_alias("dye:skyblue", "dye:azure")
-
-minetest.register_alias("unifieddyes:redviolet", "dye:rose")
-minetest.register_alias("dye:redviolet", "dye:rose")
-
 minetest.register_alias("unifieddyes:brown", "dye:brown")
 
 print(S("[UnifiedDyes] Loaded!"))