updated technic, steel, and unified dyes

3 files changed, 102 insertions, 62 deletions

diff --git a/unifieddyes/API.md b/unifieddyes/API.md
index c42d5aa..c8abd8b 100644
--- a/unifieddyes/API.md
+++ b/unifieddyes/API.md
@@ -53,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`.
 
@@ -67,46 +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
-    `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.
-    `wallmounted`: the 32-color palette, for nodes using `colorwallmounted` mode.
-    `extended`: the 256-color "extended" 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 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.
+* `extended`: the 256-color "extended" palette
 
-**`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.
-
-**`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
+**`unifieddyes.color_to_name(param2, def)`**
 
-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.
+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.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.on_airbrush(itemstack, player, pointed_thing)`**
 
-`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.
+This is called when a node is punched while wielding the airbrush.
 
-`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.
+**`unifieddyes.show_airbrush_form(player)`**
 
-#### Converting an old mod
+This one does just what it sounds like - it shows the color selector formspec.
 
-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:
+**`unifieddyes.on_construct(pos)`**
 
-* Remove these keys:
+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.
 
-```lua
-	after_dig_node = unifieddyes.after_dig_node,
-	place_param2 = 240,
-	after_place_node = unifieddyes.recolor_on_place,
-```
+**`unifieddyes.register_color_craft(recipe)`**
 
-* Add a call to the create-all-recipes helper.  Here's an example:
+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:
 
 ```lua
 	unifieddyes.register_color_craft({
@@ -127,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:
 
@@ -152,8 +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, 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.
diff --git a/unifieddyes/init.lua b/unifieddyes/init.lua
index ec2c820..77d42d3 100644
--- a/unifieddyes/init.lua
+++ b/unifieddyes/init.lua
@@ -718,9 +718,6 @@ function unifieddyes.on_airbrush(itemstack, player, pointed_thing)
 
 		local a,b = string.gsub(nodename2, oldcolor, newcolor)
 		name = modname..":"..a
-
-		print("[UD]", name, modname, nodename2, oldcolor, newcolor)
-
 	elseif idx == oldidx then
 		return
 	end
@@ -832,10 +829,13 @@ end
 function unifieddyes.show_airbrush_form(player)
 	if not player then return end
 	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 base_form = "size[15,8.5]label[7,-0.25;Select a color:]"
+	local selindic = "unifieddyes_select_overlay.png^unifieddyes_question.png]"
+
 	local size="0.75,0.75;"
 	local hps=0.6
 	local vps=1.3
@@ -867,16 +867,20 @@ function unifieddyes.show_airbrush_form(player)
 
 			local color = string.format("%02x", r2)..string.format("%02x", g2)..string.format("%02x", b2)
 			local dye = "dye:"..val..hue..sat
+
 			local overlay = ""
+			local colorize = minetest.formspec_escape("^[colorize:#"..color..":255")
+
 			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
+			if dye == painting_with then
 				overlay = "^unifieddyes_select_overlay.png"
+				selindic = "unifieddyes_white_square.png"..colorize..overlay.."]"..
+							"tooltip["..val..hue..sat..";"..val..hue..sat.."]"
 			end
 
-			local colorize = minetest.formspec_escape("^[colorize:#"..color..":255")
 			base_form = base_form.."image_button["..
 									(hp*hps)..","..(v2*vps+vs)..";"..
 									size..
@@ -917,16 +921,18 @@ function unifieddyes.show_airbrush_form(player)
 				local dye = "dye:"..val..hue..sat
 
 				local overlay = ""
+				local colorize = minetest.formspec_escape("^[colorize:#"..color..":255")
+
 				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
+				if dye == painting_with then
 					overlay = "^unifieddyes_select_overlay.png"
+					selindic = "unifieddyes_white_square.png"..colorize..overlay.."]"..
+								"tooltip["..val..hue..sat..";"..val..hue..sat.."]"
 				end
 
-				local colorize = minetest.formspec_escape("^[colorize:#"..color..":255")
-
 				base_form = base_form.."image_button["..
 										(hp*hps)..","..(v2*vps+vs)..";"..
 										size..
@@ -955,15 +961,18 @@ function unifieddyes.show_airbrush_form(player)
 		local dye = "dye:"..grey2
 
 		local overlay = ""
+		local colorize = minetest.formspec_escape("^[colorize:#"..grey..":255")
+
 		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
+		if dye == painting_with then
 			overlay = "^unifieddyes_select_overlay.png"
+			slindic = "unifieddyes_white_square.png"..colorize..overlay.."]"..
+						"tooltip["..grey2..";"..grey2.."]"
 		end
 
-		local colorize = minetest.formspec_escape("^[colorize:#"..grey..":255")
 		base_form = base_form.."image_button["..
 								(hp*hps)..","..(v2*vps+vs)..";"..
 								size..
@@ -976,20 +985,21 @@ function unifieddyes.show_airbrush_form(player)
 		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]"..
+				"label[11.0,"..(vps*5.1+vs)..";Dyes on hand]"
+	end
+		base_form = base_form..
 				"image[12.5,"..(vps*5+vs)..";"..size..
-				"unifieddyes_select_overlay.png]"..
+				selindic..
 				"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
+	if painting_with then
 		base_form = base_form..
 					"label[1,"..(7.5+vs)..";Selected dye:  "..
-					unifieddyes.player_selected_dye[player_name].."]"
+					painting_with.."]"
 	end
 
 	minetest.show_formspec(player_name, "unifieddyes:dye_select_form", base_form)
@@ -1039,18 +1049,25 @@ 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 s3 = string.sub(s1,1, string.find(s1, '"')-1)
-		if s3 == "cancel" then
-			unifieddyes.player_selected_dye[player_name] = nil
-			return
-		elseif s3 == "accept" and unifieddyes.player_selected_dye[player_name] then
-			local dye = unifieddyes.player_selected_dye[player_name]
-			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
+		if fields.quit then
+			if not fields.accept then
+				unifieddyes.player_selected_dye[player_name] = nil
+				return
+			else
+				local dye = unifieddyes.player_selected_dye[player_name]
+				if not dye then
+					minetest.chat_send_player(player_name, "*** Clicked \"Accept\", but no color was selected!")
+					return
+				end
+				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
+			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
diff --git a/unifieddyes/textures/unifieddyes_question.png b/unifieddyes/textures/unifieddyes_question.png
new file mode 100644
index 0000000..0b25633
--- /dev/null
+++ b/unifieddyes/textures/unifieddyes_question.png