From 481184765542a4caebc10fe4cfbf3589e0344d8a Mon Sep 17 00:00:00 2001
From: Vanessa Dannenberg <vanessa.e.dannenberg@gmail.com>
Date: Thu, 13 Sep 2018 22:16:47 -0400
Subject: [PATCH] check palette filename when airbrushing to determine mode.
 (relying just on paramtype2 doesn't work :-/ )

---
 init.lua | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/init.lua b/init.lua
index 8f6de0f..c371b69 100644
--- a/init.lua
+++ b/init.lua
@@ -654,12 +654,14 @@ function unifieddyes.on_airbrush(itemstack, player, pointed_thing)
 
 	local palette = nil
 	local fdir = 0
-	if def.paramtype2 == "color" then
+	if def.palette == "unifieddyes_palette_extended.png" then
 		palette = "extended"
-	elseif def.paramtype2 == "colorwallmounted" then
+	elseif def.palette == "unifieddyes_palette_colorwallmounted.png" then
 		palette = "wallmounted"
 		fdir = node.param2 % 8
-	elseif def.paramtype2 ==  "colorfacedir" then
+	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
@@ -871,19 +873,24 @@ function unifieddyes.show_airbrush_form(player)
 
 	local last_right_click = unifieddyes.player_last_right_clicked[player_name]
 	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
+		if last_right_click.def and last_right_click.def.palette then
+			if last_right_click.def.palette == "unifieddyes_palette_colorwallmounted.png" then
 				nodepalette = "wallmounted"
-			elseif last_right_click.def.paramtype2 == "color" then
+			elseif last_right_click.def.palette == "unifieddyes_palette_extended.png" 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
+			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 not last_right_click.def.groups or not last_right_click.def.groups.ud_param2_colorable then
+	if 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;(Right-clicked a node not supported by the Airbrush, showing all colors)]"
 	end