respect the shift click convention and fix unreachable if else(if) tree

This reverts commit eb5610fc10.

.github/workflows/luacheck.yml

@@ -0,0 +1,18 @@
+
+name: luacheck
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: apt
+      run: sudo apt-get install -y luarocks
+    - name: luacheck install
+      run: luarocks install --local luacheck
+    - name: luacheck run
+      run: $HOME/.luarocks/bin/luacheck ./

.luacheckrc

@@ -0,0 +1,25 @@
+unused_args = false
+allow_defined_top = true
+
+exclude_files = {".luacheckrc"}
+
+globals = {
+    "minetest", "core",
+
+    --mod provided
+    "unifieddyes",
+}
+
+read_globals = {
+    string = {fields = {"split"}},
+    table = {fields = {"copy", "getn"}},
+
+    --luac
+    "math", "table",
+
+    -- Builtin
+    "vector", "ItemStack", "dump", "DIR_DELIM", "VoxelArea", "Settings", "PcgRandom", "VoxelManip", "PseudoRandom",
+
+    --mod produced
+
+}

README.md

@@ -13,4 +13,4 @@ Install: Unzip the distribution file, rename the resultant folder to just "unifi
 
 Usage: for detailed usage information, please see [the Unified Dyes Thread](https://forum.minetest.net/viewtopic.php?f=11&t=2178&p=28399) on the Minetest forum.
 
-API: the full API is documented here: https://github.com/minetest-mods/unifieddyes/blob/master/API.md
+API: the full API is documented here: https://github.com/mt-mods/unifieddyes/blob/master/API.md

airbrush.lua

@@ -0,0 +1,513 @@
+-- This file supplies all the code related to the airbrush
+
+local S = minetest.get_translator("unifieddyes")
+
+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] then
+		painting_with = unifieddyes.player_current_dye[player_name]
+	end
+
+	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
+
+	local pos = minetest.get_pointed_thing_position(pointed_thing)
+	if not pos then
+		local look_angle = player:get_look_vertical()
+		if look_angle > -1.55 then
+			minetest.chat_send_player(player_name, "*** No node selected")
+		else
+			local hexcolor = unifieddyes.get_color_from_dye_name(painting_with)
+			if hexcolor then
+				local r = tonumber(string.sub(hexcolor,1,2),16)
+				local g = tonumber(string.sub(hexcolor,3,4),16)
+				local b = tonumber(string.sub(hexcolor,5,6),16)
+				player:set_sky({r=r,g=g,b=b,a=255},"plain")
+			end
+		end
+		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.")
+		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
+	local fdir = 0
+	if not def or not def.palette then
+		minetest.chat_send_player(player_name, "*** That node can't be colored -- it's either undefined or has no palette.")
+		return
+	elseif 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_extended.png"
+	  and def.palette ~= "unifieddyes_palette_colorwallmounted.png"
+	  and string.find(def.palette, "unifieddyes_palette_") then
+		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 minetest.is_creative_enabled(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
+		)
+		return
+	end
+
+	if not idx then
+		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
+	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
+		local newcolor
+
+		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 minetest.is_creative_enabled(player_name) then
+		inv:remove_item("main", painting_with)
+		return
+	end
+end
+
+local hps = 0.6 -- horizontal position scale
+local vps = 1.3 -- vertical position scale
+local vs = 0.1 -- vertical shift/offset
+
+local color_button_size = ";0.75,0.75;"
+local color_square_size = ";0.69,0.69;"
+
+function unifieddyes.make_readable_color(color)
+        -- is this a low saturation color?
+        local has_low_saturtation = string.find(color, "s50");
+
+        -- remove _s50 tag, we care about that later again
+	local s = string.gsub(color, "_s50", "")
+
+        -- replace underscores with spaces to make it look nicer
+	s = string.gsub(s, "_", " ")
+
+        -- capitalize words, you know, looks nicer ;)
+        s = string.gsub(s, "(%l)(%w*)", function(a,b) return string.upper(a)..b end)
+
+        -- add the word dye, this is what the translations expect
+        s = s.." Dye"
+
+	-- if it is a low sat color, append an appropriate string
+	if has_low_saturtation then
+	  s = s.." (low saturation)"
+	end
+
+	return s
+end
+
+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
+
+	local tooltip = "tooltip["..colorname..";"..
+					S(unifieddyes.make_readable_color(colorname))..
+					"\n(dye:"..colorname..")]"
+
+	if dye == painting_with then
+		overlay = "^unifieddyes_select_overlay.png"
+		selindic = "unifieddyes_white_square.png"..colorize..overlay..unavail_overlay.."]"..tooltip
+	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
+	else
+		form = "image["..
+					(hp*hps)..","..(v2*vps+vs)..
+					color_square_size..
+					"unifieddyes_white_square.png"..colorize..overlay..unavail_overlay.."]"..
+					tooltip
+	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 = minetest.is_creative_enabled(player_name)
+	local inv = player:get_inventory()
+	local nodepalette = "extended"
+	local showall = unifieddyes.player_showall[player_name]
+
+	t[1] = "size[14.5,8.5]label[7,-0.3;"..S("Select a color:").."]"
+	local selindic = "unifieddyes_select_overlay.png^unifieddyes_question.png]"
+
+	local last_right_click = unifieddyes.player_last_right_clicked[player_name]
+	if last_right_click then
+		if not last_right_click.def then
+			last_right_click.def = {}
+			last_right_click.undef = true
+		elseif 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
+				t[#t+1] = "label[0.5,8.25;"..S("(Right-clicked a node that supports all 256 colors, showing them all)").."]"
+				showall = true
+			elseif last_right_click.def.palette ~= "unifieddyes_palette_extended.png"
+			  and last_right_click.def.palette ~= "unifieddyes_palette_colorwallmounted.png"
+			  and string.find(last_right_click.def.palette, "unifieddyes_palette_") then
+				nodepalette = "split"
+			end
+		end
+	end
+
+	if last_right_click.undef then
+		t[#t+1] = "label[0.5,8.25;"..S("(Right-clicked an undefined node, showing all colors)").."]"
+	elseif not last_right_click.def.groups
+	  or not last_right_click.def.groups.ud_param2_colorable
+	  or not last_right_click.def.palette
+	  or not string.find(last_right_click.def.palette, "unifieddyes_palette_") then
+		t[#t+1] = "label[0.5,8.25;"..S("(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]
+
+		local sat = ""
+		local v2=(v/2)
+
+		for hi, h in ipairs(unifieddyes.HUES_EXTENDED) do
+			local hue = h[1]
+			local hp=hi-1
+
+			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 hexcolor = string.format("%02x", r2)..string.format("%02x", g2)..string.format("%02x", b2)
+			local f
+			f, selindic = unifieddyes.make_colored_square(hexcolor, val..hue..sat, showall, creative, painting_with, nodepalette,
+			hp, v2, selindic, inv, explist)
+			t[#t+1] = f
+		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-1
+
+				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 hexcolor = string.format("%02x", r3)..string.format("%02x", g3)..string.format("%02x", b3)
+				local f
+				f, selindic = unifieddyes.make_colored_square(hexcolor, val..hue..sat, showall, creative, painting_with,
+				nodepalette, hp, v2, selindic, inv, explist)
+				t[#t+1] = f
+			end
+		end
+	end
+
+	local v2=5
+	for y = 0, 15 do
+
+		local hp=15-y
+
+		local hexgrey = string.format("%02x", y*17)..string.format("%02x", y*17)..string.format("%02x", y*17)
+		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
+
+		local f
+		f, selindic = unifieddyes.make_colored_square(hexgrey, grey, showall, creative, painting_with, nodepalette, hp, v2,
+		selindic, inv, explist)
+		t[#t+1] = f
+
+	end
+
+	if not creative then
+		t[#t+1] = "image[10,"
+		t[#t+1] = (vps*5.55+vs)
+		t[#t+1] = color_button_size
+		t[#t+1] = "unifieddyes_onhand_overlay.png]label[10.7,"
+		t[#t+1] = (vps*5.51+vs)
+		t[#t+1] = ";"..S("Dyes").."]"
+		t[#t+1] = "label[10.7,"
+		t[#t+1] = (vps*5.67+vs)
+		t[#t+1] = ";on hand]"
+
+	end
+
+	t[#t+1] = "image[10,"
+	t[#t+1] = (vps*5+vs)
+	t[#t+1] = color_button_size
+	t[#t+1] = selindic
+
+	if painting_with then
+		t[#t+1] = "label[10.7,"
+		t[#t+1] = (vps*4.90+vs)
+		t[#t+1] = ";"..S("Your selection:").."]"
+		t[#t+1] = "label[10.7,"
+		t[#t+1] = (vps*5.07+vs)
+		t[#t+1] = ";"
+		t[#t+1] = S(unifieddyes.make_readable_color(string.sub(painting_with, 5)))
+		t[#t+1] = "]label[10.7,"
+		t[#t+1] = (vps*5.24+vs)
+		t[#t+1] = ";("
+		t[#t+1] = painting_with
+		t[#t+1] = ")]"
+	else
+		t[#t+1] = "label[10.7,"
+		t[#t+1] = (vps*5.07+vs)
+		t[#t+1] = ";"..S("Your selection").."]"
+	end
+
+	t[#t+1] = "button_exit[10.5,8;2,1;cancel;"..S("Cancel").."]button_exit[12.5,8;2,1;accept;"..S("Accept").."]"
+
+
+	if last_right_click and last_right_click.def and nodepalette ~= "extended" then
+		if showall then
+			t[#t+1] = "button[0,8;2,1;show_avail;"..S("Show Available").."]"
+			t[#t+1] = "label[2,8.25;"..S("(Currently showing all 256 colors)").."]"
+		else
+			t[#t+1] = "button[0,8;2,1;show_all;"..S("Show All Colors").."]"
+			t[#t+1] = "label[2,8.25;"..S("(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_on_player_receive_fields(function(player, formname, fields)
+
+	if formname == "unifieddyes:dye_select_form" then
+
+		local player_name = player:get_player_name()
+		local nodepalette = "extended"
+		local showall = unifieddyes.player_showall[player_name]
+
+		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 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]
+				if not dye then
+					minetest.chat_send_player(player_name, "*** Clicked \"Accept\", but no color was selected!")
+					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 = minetest.is_creative_enabled(player_name)
+			local dye = "dye:"..s3
+
+			if (showall or unifieddyes.palette_has_color[nodepalette.."_"..s3]) and
+				(creative or inv:contains_item("main", dye)) then
+				unifieddyes.player_selected_dye[player_name] = dye
+				unifieddyes.show_airbrush_form(player)
+			end
+		end
+	end
+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()
+		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
+
+		if keys.sneak and def and def.on_rightclick then
+			return def.on_rightclick(pos, node, placer, itemstack, pointed_thing)
+		end
+
+		unifieddyes.player_last_right_clicked[player_name] = {pos = pos, node = node, def = def}
+
+		if not keys.aux1 then
+			unifieddyes.show_airbrush_form(placer)
+		elseif keys.aux1 then
+			if not pos or not def then return end
+			local newcolor = unifieddyes.color_to_name(node.param2, def)
+
+			if newcolor and string.find(def.paramtype2, "color") then
+				minetest.chat_send_player(player_name, "*** Switching to "..newcolor.." for the airbrush, to match that node.")
+				unifieddyes.player_current_dye[player_name] = "dye:"..newcolor
+			else
+				minetest.chat_send_player(player_name, "*** That node is uncolored.")
+			end
+		end
+	end
+})

aliases.lua

@@ -0,0 +1,25 @@
+if minetest.get_modpath("dye") then
+    minetest.register_alias("dye:light_red",  "dye:pink")
+    minetest.register_alias("dye:medium_orange", "dye:brown")
+end
+
+minetest.register_alias("unifieddyes:black",      "dye:black")
+minetest.register_alias("unifieddyes:dark_grey",  "dye:dark_grey")
+minetest.register_alias("unifieddyes:grey", 	  "dye:grey")
+minetest.register_alias("unifieddyes:light_grey", "dye:light_grey")
+minetest.register_alias("unifieddyes:white",      "dye:white")
+
+minetest.register_alias("unifieddyes:grey_0",     "dye:black")
+minetest.register_alias("unifieddyes:grey_4",     "dye:dark_grey")
+minetest.register_alias("unifieddyes:grey_8",     "dye:grey")
+minetest.register_alias("unifieddyes:grey_11",    "dye:light_grey")
+minetest.register_alias("unifieddyes:grey_15",    "dye:white")
+
+minetest.register_alias("unifieddyes:white_paint", "dye:white")
+minetest.register_alias("unifieddyes:titanium_dioxide", "dye:white")
+minetest.register_alias("unifieddyes:lightgrey_paint", "dye:light_grey")
+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")
+
+minetest.register_alias("unifieddyes:brown", "dye:brown")

api.lua

@@ -0,0 +1,489 @@
+-- This file supplies the majority of Unified Dyes' API
+
+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),
+-- 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
+		  or not placer then
+			return false
+		end
+
+		if not string.find(itemstack:to_string(), "palette_index") then
+			local param2
+			local color = 0
+
+			if def.palette == "unifieddyes_palette_extended.png"
+			  and def.paramtype2 == "color" then
+				param2 = 240
+				color = 240
+			elseif def.palette == "unifieddyes_palette_colorwallmounted.png"
+			  and def.paramtype2 == "colorwallmounted" then
+				param2 = newnode.param2 % 8
+			elseif string.find(def.palette, "unifieddyes_palette_")
+			  and def.paramtype2 == "colorfacedir" then -- it's a split palette
+				param2 = newnode.param2 % 32
+			end
+
+			if param2 then
+				minetest.swap_node(pos, {name = newnode.name, param2 = param2})
+				minetest.get_meta(pos):set_int("palette_index", color)
+			end
+		end
+	end
+)
+
+-- The complementary function:  strip-off the color if the node being dug is still white/neutral
+
+local function move_item(item, pos, inv, digger)
+  if not (digger and digger:is_player()) then return end
+	local creative = minetest.is_creative_enabled(digger:get_player_name())
+	if inv:room_for_item("main", item)
+	  and (not creative or not inv:contains_item("main", item, true)) then
+		inv:add_item("main", item)
+	elseif not creative then
+		minetest.item_drop(ItemStack(item), digger, pos)
+	end
+	minetest.remove_node(pos)
+end
+
+function unifieddyes.on_dig(pos, node, digger)
+	if not digger then return end
+	local playername = digger:get_player_name()
+	if minetest.is_protected(pos, playername) then
+		minetest.record_protection_violation(pos, playername)
+		return
+	end
+
+	local oldparam2 = minetest.get_node(pos).param2
+	local def = minetest.registered_items[node.name]
+	local del_color
+
+	if def.paramtype2 == "color" and oldparam2 == 240 and def.palette == "unifieddyes_palette_extended.png" then
+		del_color = true
+	elseif def.paramtype2 == "colorwallmounted" and math.floor(oldparam2 / 8) == 0
+			and def.palette == "unifieddyes_palette_colorwallmounted.png" then
+		del_color = true
+	elseif def.paramtype2 == "colorfacedir" and math.floor(oldparam2 / 32) == 0
+			and string.find(def.palette, "unifieddyes_palette_") then
+		del_color = true
+	end
+
+	local inv = digger:get_inventory()
+
+	if del_color then
+		move_item(node.name, pos, inv, digger)
+	else
+		return minetest.node_dig(pos, node, digger)
+	end
+end
+
+-- just stubs to keep old mods from crashing when expecting auto-coloring
+-- or getting back the dye on dig.
+
+function unifieddyes.recolor_on_place(foo)
+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)
+	local paletteidx = unifieddyes.getpaletteidx(color, palette)
+	local stack = ItemStack(item)
+	stack:get_meta():set_int("palette_index", paletteidx)
+	return stack:to_string(),paletteidx
+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, h, sat, val)
+	local hue = (type(h) == "table") and h[1] or h
+	local color
+	if val then
+		if craft.palette == "wallmounted" then
+			color = val..hue..sat
+		else
+			color = val..hue..sat
+		end
+	else
+		color = hue -- if val is nil, then it's grey.
+	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)
+	local newrecipe = minetest.deserialize(recipe)
+
+	local coutput = craft.output or ""
+	local output = coutput
+	if craft.output_prefix then
+		if craft.palette ~= "split" then
+			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..coutput
+			elseif hue == "pink" then
+				dye = "dye:light_red"
+				output = craft.output_prefix.."red"..craft.output_suffix..coutput
+			else
+				output = craft.output_prefix..hue..craft.output_suffix..coutput
+			end
+		end
+	end
+
+	local colored_itemstack =
+		unifieddyes.make_colored_itemstack(output, craft.palette, dye)
+
+	minetest.register_craft({
+		output = colored_itemstack,
+		type = craft.type,
+		recipe = newrecipe
+	})
+
+end
+
+function unifieddyes.register_color_craft(craft)
+	local hues_table = unifieddyes.HUES_EXTENDED
+	local sats_table = unifieddyes.SATS
+	local vals_table = unifieddyes.VALS_SPLIT
+	local greys_table = unifieddyes.GREYS
+
+	if craft.palette == "wallmounted" then
+		register_c(craft, "green", "", "light_")
+		register_c(craft, "blue", "", "light_")
+		hues_table = unifieddyes.HUES_WALLMOUNTED
+		sats_table = {""}
+		vals_table = unifieddyes.VALS
+	elseif craft.palette == "extended" then
+		vals_table = unifieddyes.VALS_EXTENDED
+		greys_table = unifieddyes.GREYS_EXTENDED
+	end
+
+	for _, hue in ipairs(hues_table) do
+		for _, val in ipairs(vals_table) do
+			for _, sat in ipairs(sats_table) do
+
+				if sat == "_s50" and val ~= "" and val ~= "medium_" and val ~= "dark_" then break end
+				register_c(craft, hue, sat, val)
+
+			end
+		end
+	end
+
+	for _, grey in ipairs(greys_table) do
+		register_c(craft, grey)
+	end
+
+	register_c(craft, "pink")
+
+end
+
+-- code borrowed from homedecor
+-- call this function to reset the rotation of a "wallmounted" object on place
+
+function unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
+	local node = minetest.get_node(pos)
+	local colorbits = node.param2 - (node.param2 % 8)
+
+	local yaw = placer:get_look_horizontal()
+	local dir = minetest.yaw_to_dir(yaw) -- -1.5)
+	local pitch = placer:get_look_vertical()
+
+	local fdir = minetest.dir_to_wallmounted(dir)
+
+	if pitch < -(math.pi/8) then
+		fdir = 0
+	elseif pitch > math.pi/8 then
+		fdir = 1
+	end
+	minetest.swap_node(pos, { name = node.name, param2 = fdir+colorbits })
+end
+
+-- use this when you have a "wallmounted" node that should never be oriented
+-- to floor or ceiling...
+
+function unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing)
+	local node = minetest.get_node(pos)
+	local colorbits = node.param2 - (node.param2 % 8)
+	local yaw = placer:get_look_horizontal()
+	local dir = minetest.yaw_to_dir(yaw+1.5)
+	local fdir = minetest.dir_to_wallmounted(dir)
+
+	minetest.swap_node(pos, { name = node.name, param2 = fdir+colorbits })
+end
+
+-- ... and use this one to force that kind of node off of floor/ceiling
+-- orientation after the screwdriver rotates it.
+
+function unifieddyes.fix_after_screwdriver_nsew(pos, node, user, mode, new_param2)
+	local new_fdir = new_param2 % 8
+	local color = new_param2 - new_fdir
+	if new_fdir < 2 then
+		new_fdir = 2
+		minetest.swap_node(pos, { name = node.name, param2 = new_fdir + color })
+		return true
+	end
+end
+
+function unifieddyes.is_buildable_to(placer_name, ...)
+	for _, pos in ipairs({...}) do
+		local node = minetest.get_node_or_nil(pos)
+		local def = node and minetest.registered_nodes[node.name]
+		if not (def and def.buildable_to) or minetest.is_protected(pos, placer_name) then
+			return false
+		end
+	end
+	return true
+end
+
+function unifieddyes.get_hsv(name) -- expects a node/item name
+	local hue = ""
+	local a
+	for _, i in ipairs(unifieddyes.HUES_EXTENDED) do
+		a,_ = string.find(name, "_"..i[1])
+		if a then
+			hue = i[1]
+			break
+		end
+	end
+
+	if string.find(name, "_light_grey")     then hue = "light_grey"
+	elseif string.find(name, "_lightgrey")  then hue = "light_grey"
+	elseif string.find(name, "_dark_grey")  then hue = "dark_grey"
+	elseif string.find(name, "_darkgrey")   then hue = "dark_grey"
+	elseif string.find(name, "_grey")       then hue = "grey"
+	elseif string.find(name, "_white")      then hue = "white"
+	elseif string.find(name, "_black")      then hue = "black"
+	end
+
+	local sat = ""
+	if string.find(name, "_s50")    then sat = "_s50" end
+
+	local val = ""
+	if string.find(name, "dark_")   then val = "dark_"   end
+	if string.find(name, "medium_") then val = "medium_" end
+	if string.find(name, "light_")  then val = "light_"  end
+
+	return hue, sat, val
+end
+
+-- code partially borrowed from cheapie's plasticbox mod
+
+-- in the function below, color is just a color string, while
+-- palette_type can be:
+--
+-- "extended" = 256 color palette
+-- "split" = 200 color palette split into pieces for colorfacedir
+-- "wallmounted" = 32-color abridged palette
+
+function unifieddyes.getpaletteidx(color, palette_type)
+
+	if string.sub(color,1,4) == "dye:" then
+		color = string.sub(color,5,-1)
+	elseif string.sub(color,1,12) == "unifieddyes:" then
+		color = string.sub(color,13,-1)
+	else
+		return
+	end
+
+	if palette_type == "wallmounted" then
+		if unifieddyes.gpidx_grayscale_wallmounted[color] then
+			return (unifieddyes.gpidx_grayscale_wallmounted[color] * 8), 0
+		end
+	elseif palette_type == "split" then
+		if unifieddyes.gpidx_grayscale[color] then
+			return (unifieddyes.gpidx_grayscale[color] * 32), 0
+		end
+	elseif palette_type == "extended" then
+		if unifieddyes.gpidx_grayscale_extended[color] then
+			return unifieddyes.gpidx_grayscale_extended[color]+240, 0
+		end
+	end
+
+	local shade = "" -- assume full
+	if string.sub(color,1,6) == "faint_" then
+		shade = "faint"
+		color = string.sub(color,7,-1)
+	elseif string.sub(color,1,7) == "pastel_" then
+		shade = "pastel"
+		color = string.sub(color,8,-1)
+	elseif string.sub(color,1,6) == "light_" then
+		shade = "light"
+		color = string.sub(color,7,-1)
+	elseif string.sub(color,1,7) == "bright_" then
+		shade = "bright"
+		color = string.sub(color,8,-1)
+	elseif string.sub(color,1,7) == "medium_" then
+		shade = "medium"
+		color = string.sub(color,8,-1)
+	elseif string.sub(color,1,5) == "dark_" then
+		shade = "dark"
+		color = string.sub(color,6,-1)
+	end
+	if string.sub(color,-4,-1) == "_s50" then
+		shade = shade.."s50"
+		color = string.sub(color,1,-5)
+	end
+
+	if palette_type == "wallmounted" then
+		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 unifieddyes.gpidx_hues_wallmounted[color] and unifieddyes.gpidx_shades_wallmounted[shade] then
+			return (unifieddyes.gpidx_shades_wallmounted[shade] * 64 + unifieddyes.gpidx_hues_wallmounted[color] * 8),
+			unifieddyes.gpidx_hues_wallmounted[color]
+		end
+	else
+		if color == "brown" then
+			color = "orange"
+			shade = "medium"
+		elseif color == "pink" then
+			color = "red"
+			shade = "light"
+		end
+		if palette_type == "split" then -- it's colorfacedir
+			if unifieddyes.gpidx_hues_extended[color] and unifieddyes.gpidx_shades_split[shade] then
+				return (unifieddyes.gpidx_shades_split[shade] * 32), unifieddyes.gpidx_hues_extended[color]+1
+			end
+		elseif palette_type == "extended" then
+			if unifieddyes.gpidx_hues_extended[color] and unifieddyes.gpidx_shades_extended[shade] then
+				return (unifieddyes.gpidx_hues_extended[color] + unifieddyes.gpidx_shades_extended[shade]*24),
+				unifieddyes.gpidx_hues_extended[color]
+			end
+		end
+	end
+end
+
+function unifieddyes.get_color_from_dye_name(name)
+	if name == "dye:black" then
+		return "000000"
+	elseif name == "dye:white" then
+		return "ffffff"
+	end
+	local item = minetest.registered_items[name]
+	if not item then return end
+	local inv_image = item.inventory_image
+	if not inv_image then return end
+	return string.match(inv_image,"colorize:#(......):200")
+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

color-tables.lua

@@ -0,0 +1,219 @@
+
+-- the names of the various colors here came from http://www.procato.com/rgb+index/
+
+unifieddyes.HUES_EXTENDED = {
+	{ "red",        0xff, 0x00, 0x00 },
+	{ "vermilion",  0xff, 0x40, 0x00 },
+	{ "orange",     0xff, 0x80, 0x00 },
+	{ "amber",      0xff, 0xbf, 0x00 },
+	{ "yellow",     0xff, 0xff, 0x00 },
+	{ "lime",       0xbf, 0xff, 0x00 },
+	{ "chartreuse", 0x80, 0xff, 0x00 },
+	{ "harlequin",  0x40, 0xff, 0x00 },
+	{ "green",      0x00, 0xff, 0x00 },
+	{ "malachite",  0x00, 0xff, 0x40 },
+	{ "spring",     0x00, 0xff, 0x80 },
+	{ "turquoise",  0x00, 0xff, 0xbf },
+	{ "cyan",       0x00, 0xff, 0xff },
+	{ "cerulean",   0x00, 0xbf, 0xff },
+	{ "azure",      0x00, 0x80, 0xff },
+	{ "sapphire",   0x00, 0x40, 0xff },
+	{ "blue",       0x00, 0x00, 0xff },
+	{ "indigo",     0x40, 0x00, 0xff },
+	{ "violet",     0x80, 0x00, 0xff },
+	{ "mulberry",   0xbf, 0x00, 0xff },
+	{ "magenta",    0xff, 0x00, 0xff },
+	{ "fuchsia",    0xff, 0x00, 0xbf },
+	{ "rose",       0xff, 0x00, 0x80 },
+	{ "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",
+	"yellow",
+	"green",
+	"cyan",
+	"blue",
+	"violet",
+	"magenta"
+}
+
+unifieddyes.SATS = {
+	"",
+	"_s50"
+}
+
+unifieddyes.VALS = {
+	"",
+	"medium_",
+	"dark_"
+}
+
+unifieddyes.VALS_SPLIT = {
+	"faint_",
+	"light_",
+	"",
+	"medium_",
+	"dark_"
+}
+
+unifieddyes.VALS_EXTENDED = {
+	"faint_",
+	"pastel_",
+	"light_",
+	"bright_",
+	"",
+	"medium_",
+	"dark_"
+}
+
+unifieddyes.GREYS = {
+	"white",
+	"light_grey",
+	"grey",
+	"dark_grey",
+	"black"
+}
+
+unifieddyes.GREYS_EXTENDED = table.copy(unifieddyes.GREYS)
+
+for i = 1, 14 do
+	if i ~= 0 and i ~= 4 and i ~= 8 and i ~= 11 and i ~= 15 then
+		table.insert(unifieddyes.GREYS_EXTENDED, "grey_"..i)
+	end
+end
+
+-- reverse lookups for getpaletteidx()
+
+unifieddyes.gpidx_aliases = {
+	["pink"] = "light_red",
+	["brown"] = "medium_orange",
+	["azure"] = "light_blue"
+}
+
+unifieddyes.gpidx_grayscale = {
+	["white"] = 1,
+	["light_grey"] = 2,
+	["grey"] = 3,
+	["dark_grey"] = 4,
+	["black"] = 5,
+}
+
+unifieddyes.gpidx_grayscale_extended = {
+	["white"] = 0,
+	["grey_14"] = 1,
+	["grey_13"] = 2,
+	["grey_12"] = 3,
+	["light_grey"] = 4,
+	["grey_11"] = 4,
+	["grey_10"] = 5,
+	["grey_9"] = 6,
+	["grey_8"] = 7,
+	["grey"] = 7,
+	["grey_7"] = 8,
+	["grey_6"] = 9,
+	["grey_5"] = 10,
+	["grey_4"] = 11,
+	["dark_grey"] = 11,
+	["grey_3"] = 12,
+	["grey_2"] = 13,
+	["grey_1"] = 14,
+	["black"] = 15,
+}
+
+unifieddyes.gpidx_grayscale_wallmounted = {
+	["white"] = 0,
+	["light_grey"] = 1,
+	["grey"] = 2,
+	["dark_grey"] = 3,
+	["black"] = 4,
+}
+
+unifieddyes.gpidx_hues_extended = {
+	["red"] = 0,
+	["vermilion"] = 1,
+	["orange"] = 2,
+	["amber"] = 3,
+	["yellow"] = 4,
+	["lime"] = 5,
+	["chartreuse"] = 6,
+	["harlequin"] = 7,
+	["green"] = 8,
+	["malachite"] = 9,
+	["spring"] = 10,
+	["aqua"] = 10,
+	["turquoise"] = 11,
+	["cyan"] = 12,
+	["cerulean"] = 13,
+	["azure"] = 14,
+	["skyblue"] = 14,
+	["sapphire"] = 15,
+	["blue"] = 16,
+	["indigo"] = 17,
+	["violet"] = 18,
+	["mulberry"] = 19,
+	["magenta"] = 20,
+	["fuchsia"] = 21,
+	["rose"] = 22,
+	["redviolet"] = 22,
+	["crimson"] = 23,
+}
+
+unifieddyes.gpidx_hues_wallmounted = {
+	["red"] = 0,
+	["orange"] = 1,
+	["yellow"] = 2,
+	["green"] = 3,
+	["cyan"] = 4,
+	["blue"] = 5,
+	["violet"] = 6,
+	["magenta"] = 7
+}
+
+unifieddyes.gpidx_shades = {
+	[""] = 1,
+	["s50"] = 2,
+	["light"] = 3,
+	["medium"] = 4,
+	["mediums50"] = 5,
+	["dark"] = 6,
+	["darks50"] = 7,
+}
+
+unifieddyes.gpidx_shades_split = {
+	["faint"] = 0,
+	[""] = 1,
+	["s50"] = 2,
+	["light"] = 3,
+	["medium"] = 4,
+	["mediums50"] = 5,
+	["dark"] = 6,
+	["darks50"] = 7,
+}
+
+unifieddyes.gpidx_shades_extended = {
+	["faint"] = 0,
+	["pastel"] = 1,
+	["light"] = 2,
+	["bright"] = 3,
+	[""] = 4,
+	["s50"] = 5,
+	["medium"] = 6,
+	["mediums50"] = 7,
+	["dark"] = 8,
+	["darks50"] = 9
+}
+
+unifieddyes.gpidx_shades_wallmounted = {
+	[""] = 1,
+	["medium"] = 2,
+	["dark"] = 3
+}

dyes-crafting.lua

@@ -0,0 +1,311 @@
+-- crafting!
+
+-- Generate all dyes that are not part of the default minetest_game dyes mod
+
+local S = minetest.get_translator("unifieddyes")
+
+for _, h in ipairs(unifieddyes.HUES_EXTENDED) do
+	local hue = h[1]
+	local r = h[2]
+	local g = h[3]
+	local b = h[4]
+
+	for v = 0, 6 do
+		local val = unifieddyes.VALS_EXTENDED[v+1]
+
+		local factor = 40
+		if v > 3 then factor = 75 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)
+
+		-- full-sat color
+
+		local desc = hue:gsub("%a", string.upper, 1).." Dye"
+
+		if val ~= "" then
+			desc = val:sub(1, -2):gsub("%a", string.upper, 1) .." "..desc
+		end
+
+		local color = string.format("%02x", r2)..string.format("%02x", g2)..string.format("%02x", b2)
+		if minetest.registered_items["dye:"..val..hue] then
+			minetest.override_item("dye:"..val..hue, {
+				inventory_image = "unifieddyes_dye.png^[colorize:#"..color..":200",
+			})
+		else
+			if (val..hue) ~= "medium_orange"
+			  and (val..hue) ~= "light_red" then
+				minetest.register_craftitem(":dye:"..val..hue, {
+					description = S(desc),
+					inventory_image = "unifieddyes_dye.png^[colorize:#"..color..":200",
+					groups = { dye=1, not_in_creative_inventory=1 },
+				})
+			end
+		end
+		minetest.register_alias("unifieddyes:"..val..hue, "dye:"..val..hue)
+
+		if v > 3 then -- also register the low-sat version
+
+			local pr = 0.299
+			local pg = 0.587
+			local pb = 0.114
+
+			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 ccolor = string.format("%02x", r3)..string.format("%02x", g3)..string.format("%02x", b3)
+
+			minetest.register_craftitem(":dye:"..val..hue.."_s50", {
+				description = S(desc.." (low saturation)"),
+				inventory_image = "unifieddyes_dye.png^[colorize:#"..ccolor..":200",
+				groups = { dye=1, not_in_creative_inventory=1 },
+			})
+			minetest.register_alias("unifieddyes:"..val..hue.."_s50", "dye:"..val..hue.."_s50")
+		end
+	end
+end
+
+-- register the greyscales too :P
+
+for y = 1, 14 do -- colors 0 and 15 are black and white, default dyes
+
+	if y ~= 4 and y ~= 8 and y~= 11 then -- don't register the three greys, they're done separately.
+
+		local rgb = string.format("%02x", y*17)..string.format("%02x", y*17)..string.format("%02x", y*17)
+		local name = "grey_"..y
+		local desc = "Grey Dye #"..y
+
+		minetest.register_craftitem(":dye:"..name, {
+			description = S(desc),
+			inventory_image = "unifieddyes_dye.png^[colorize:#"..rgb..":200",
+			groups = { dye=1, not_in_creative_inventory=1 },
+		})
+		minetest.register_alias("unifieddyes:"..name, "dye:"..name)
+	end
+end
+
+if minetest.get_modpath("dye") then
+	minetest.override_item("dye:grey", {
+		inventory_image = "unifieddyes_dye.png^[colorize:#888888:200",
+	})
+
+	minetest.override_item("dye:dark_grey", {
+		inventory_image = "unifieddyes_dye.png^[colorize:#444444:200",
+	})
+
+	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 },
+	})
+end
+
+-- 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
+
+unifieddyes.base_color_crafts = {
+	{ "red",		"flowers:rose",				nil,				nil,			nil,			nil,		4 },
+	{ "vermilion",	"dye:red",					"dye:orange",		nil,			nil,			nil,		3 },
+	{ "orange",		"flowers:tulip",			nil,				nil,			nil,			nil,		4 },
+	{ "orange",		"dye:red",					"dye:yellow",		nil,			nil,			nil,		2 },
+	{ "amber",		"dye:orange",				"dye:yellow",		nil,			nil,			nil,		2 },
+	{ "yellow",		"flowers:dandelion_yellow",	nil,				nil,			nil,			nil,		4 },
+	{ "lime",		"dye:yellow",				"dye:chartreuse",	nil,			nil,			nil,		2 },
+	{ "lime",		"dye:yellow",				"dye:yellow",		"dye:green",	nil,			nil,		3 },
+	{ "chartreuse",	"dye:yellow",				"dye:green",		nil,			nil,			nil,		2 },
+	{ "harlequin",	"dye:chartreuse",			"dye:green",		nil,			nil,			nil,		2 },
+	{ "harlequin",	"dye:yellow",				"dye:green",		"dye:green",	nil,			nil,		3 },
+	{ "green", 		"default:cactus",			nil,				nil,			nil,			nil,		4 },
+	{ "green", 		"dye:yellow",				"dye:blue",			nil,			nil,			nil,		2 },
+	{ "malachite",	"dye:green",				"dye:spring",		nil,			nil,			nil,		2 },
+	{ "malachite",	"dye:green",				"dye:green",		"dye:cyan",		nil,			nil,		3 },
+	{ "malachite",	"dye:green",				"dye:green",		"dye:green",	"dye:blue",		nil,		4 },
+	{ "spring",		"dye:green",				"dye:cyan",			nil,			nil,			nil,		2 },
+	{ "spring",		"dye:green",				"dye:green",		"dye:blue",		nil,			nil,		3 },
+	{ "turquoise",	"dye:spring",				"dye:cyan",			nil,			nil,			nil,		2 },
+	{ "turquoise",	"dye:green",				"dye:cyan",			"dye:cyan",		nil,			nil,		3 },
+	{ "turquoise",	"dye:green",				"dye:green",		"dye:green",	"dye:blue",		"dye:blue",	5 },
+	{ "cyan",		"dye:green",				"dye:blue",			nil,			nil,			nil,		2 },
+	{ "cerulean",	"dye:cyan",					"dye:azure",		nil,			nil,			nil,		2 },
+	{ "cerulean",	"dye:cyan",					"dye:cyan",			"dye:blue",		nil,			nil,		3 },
+	{ "cerulean",	"dye:green",				"dye:green",		"dye:blue",		"dye:blue",		"dye:blue",	5 },
+	{ "azure",		"dye:cyan",					"dye:blue",			nil,			nil,			nil,		2 },
+	{ "azure",		"dye:green",				"dye:blue",			"dye:blue",		nil,			nil,		3 },
+	{ "sapphire",	"dye:azure",				"dye:blue",			nil,			nil,			nil,		2 },
+	{ "sapphire",	"dye:cyan",					"dye:blue",			"dye:blue",		nil,			nil,		3 },
+	{ "sapphire",	"dye:green",				"dye:blue",			"dye:blue",		"dye:blue",		nil,		4 },
+	{ "blue",		"flowers:geranium",			nil,				nil,			nil,			nil,		4 },
+	{ "indigo",		"dye:blue",					"dye:violet",		nil,			nil,			nil,		2 },
+	{ "violet",		"flowers:viola",			nil,				nil,			nil,			nil,		4 },
+	{ "violet",		"dye:blue",					"dye:magenta",		nil,			nil,			nil,		2 },
+	{ "mulberry",	"dye:violet",				"dye:magenta",		nil,			nil,			nil,		2 },
+	{ "mulberry",	"dye:violet",				"dye:blue",			"dye:red",		nil,			nil,		3 },
+	{ "magenta",	"dye:blue",					"dye:red",			nil,			nil,			nil,		2 },
+	{ "fuchsia",	"dye:magenta",				"dye:rose",			nil,			nil,			nil,		2 },
+	{ "fuchsia",	"dye:blue",					"dye:red",			"dye:rose",		nil,			nil,		3 },
+	{ "fuchsia",	"dye:red",					"dye:violet",		nil,			nil,			nil,		2 },
+	{ "rose",		"dye:magenta",				"dye:red",			nil,			nil,			nil,		2 },
+	{ "rose",		"dye:red",					"dye:red",			"dye:blue",		nil,			nil,		3 },
+	{ "crimson",	"dye:rose",					"dye:red",			nil,			nil,			nil,		2 },
+	{ "crimson",	"dye:magenta",				"dye:red",			"dye:red",		nil,			nil,		3 },
+	{ "crimson",	"dye:red",					"dye:red",			"dye:red",		"dye:blue",		nil,		4 },
+
+	{ "black",		"default:coal_lump",		nil,				nil,			nil,			nil,		4 },
+	{ "white",		"flowers:dandelion_white",	nil,				nil,			nil,			nil,		4 },
+}
+
+unifieddyes.shade_crafts = {
+	{ "faint_",		"",			"dye:white",		"dye:white",	"dye:white",	4 },
+	{ "pastel_",	"",			"dye:white",		"dye:white",	nil,			3 },
+	{ "light_",		"",			"dye:white",		nil,			nil,			2 },
+	{ "bright_",	"",			"color",			"dye:white",	nil,			3 },
+	{ "",			"_s50",		"dye:light_grey",	nil,			nil,			2 },
+	{ "",			"_s50",		"dye:black",		"dye:white",	"dye:white",	3 },
+	{ "medium_",	"",			"dye:black",		nil,			nil,			2 },
+	{ "medium_",	"_s50",		"dye:grey",			nil,			nil,			2 },
+	{ "medium_",	"_s50",		"dye:black",		"dye:white",	nil,			3 },
+	{ "dark_",		"",			"dye:black",		"dye:black",	nil,			3 },
+	{ "dark_",		"_s50",		"dye:dark_grey",	nil,			nil,			2 },
+	{ "dark_",		"_s50",		"dye:black",		"dye:black",	"dye:white",	4 },
+}
+
+for _,i in ipairs(unifieddyes.base_color_crafts) do
+	local color = i[1]
+	local yield = i[7]
+
+	minetest.register_craft( {
+		type = "shapeless",
+		output = "dye:"..color.." "..yield,
+		recipe = {
+			i[2],
+			i[3],
+			i[4],
+			i[5],
+			i[6],
+		},
+	})
+
+	for _,j in ipairs(unifieddyes.shade_crafts) do
+		local firstdye = j[3]
+		if firstdye == "color" then firstdye = "dye:"..color end
+
+		-- ignore black, white, anything containing the word "grey"
+
+		if color ~= "black" and color ~= "white" and not string.find(color, "grey") then
+
+			minetest.register_craft( {
+				type = "shapeless",
+				output = "dye:"..j[1]..color..j[2].." "..j[6],
+				recipe = {
+					"dye:"..color,
+					firstdye,
+					j[4],
+					j[5]
+				},
+			})
+		end
+	end
+end
+
+-- greys
+
+unifieddyes.greymixes = {
+	{ 1,	"dye:black",			"dye:black",		"dye:black",		"dye:dark_grey",	4 },
+	{ 2,	"dye:black",			"dye:black",		"dye:dark_grey",	nil,				3 },
+	{ 3,	"dye:black",			"dye:dark_grey",	nil,				nil,				2 },
+	{ 4,	"dye:white",			"dye:black",		"dye:black",		nil,				3 },
+	{ 5,	"dye:dark_grey",		"dye:dark_grey",	"dye:grey",			nil,				3 },
+	{ 6,	"dye:dark_grey",		"dye:grey",			nil,				nil,				2 },
+	{ 7,	"dye:dark_grey",		"dye:grey",			"dye:grey",			nil,				3 },
+	{ 8,	"dye:white",			"dye:black",		nil,				nil,				2 },
+	{ 9,	"dye:grey", 			"dye:grey",			"dye:light_grey",	nil,				3 },
+	{ 10,	"dye:grey",				"dye:light_grey",	"dye:light_grey",	nil,				3 },
+	{ 11,	"dye:white",			"dye:white",		"dye:black",		nil,				3 },
+	{ 12,	"dye:light_grey",		"dye:light_grey",	"dye:white",		nil,				3 },
+	{ 13,	"dye:light_grey",		"dye:white",		nil,				nil,				2 },
+	{ 14,	"dye:white", 			"dye:white",		"dye:light_grey",	nil,				3 },
+}
+
+for _, i in ipairs(unifieddyes.greymixes) do
+	local shade = i[1]
+	local dye1 = i[2]
+	local dye2 = i[3]
+	local dye3 = i[4]
+	local dye4 = i[5]
+	local yield = i[6]
+	local color = "grey_"..shade
+	if shade == 4 then
+		color = "dark_grey"
+	elseif shade == 8 then
+		color = "grey"
+	elseif shade == 11 then
+		color = "light_grey"
+	end
+
+	minetest.register_craft( {
+		type = "shapeless",
+		output = "dye:"..color.." "..yield,
+		recipe = {
+			dye1,
+			dye2,
+			dye3,
+			dye4,
+		},
+	})
+end
+
+-- other crafts
+-- we can't make dark orange anymore because brown/medium orange conflicts
+
+minetest.register_craft( {
+	type = "shapeless",
+	output = "dye:dark_orange",
+	recipe = {
+		"dye:brown",
+		"dye:brown"
+	},
+})
+
+minetest.register_craft( {
+	output = "unifieddyes:airbrush",
+	recipe = {
+		{ "basic_materials:brass_ingot", "",           "basic_materials:plastic_sheet" },
+		{ "",                   "default:steel_ingot", ""                              },
+		{ "",                   "",                    "default:steel_ingot"           }
+	},
+})

mod.conf

@@ -1,4 +1,4 @@
 name = unifieddyes
 description = Unified Dyes expands the standard dye set from 15 to 90 colors.
-depends = default, dye, basic_materials
-min_minetest_version = 5.2.0
+optional_depends = default, dye, basic_materials
+min_minetest_version = 5.3.0