From d24ddf922f79e7cf2fbcfcb6de5b6b1f3dfc12e9 Mon Sep 17 00:00:00 2001
From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com>
Date: Thu, 30 Oct 2014 09:37:34 -0400
Subject: [PATCH] phase out the old "paint" stuff (particularly in relation to
 the various greys)

---
 README    |  2 +-
 fence.lua |  2 +-
 init.lua  | 10 +++++-----
 stick.lua |  1 -
 wood.lua  |  2 +-
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/README b/README
index f9ad5b5..ad05b71 100644
--- a/README
+++ b/README
@@ -23,7 +23,7 @@ Crafting
 Colored wood blocks
 -------------------
 
-Place two regular wood blocks and one portion of the desired dye or paint color 
+Place two regular wood blocks and one portion of the desired dye color 
 into the crafting grid, in any position. Yields two colored wood blocks.  Use 
 these directly to build with, or craft them into sticks.
 
diff --git a/fence.lua b/fence.lua
index 61c5ce3..88e5f1d 100644
--- a/fence.lua
+++ b/fence.lua
@@ -264,7 +264,7 @@ for grey = 1,5 do
 		recipe = {
 			neutral_block,
 			neutral_block,
-			"unifieddyes:"..greyname3
+			greyname3
 		},
 	})
 
diff --git a/init.lua b/init.lua
index 78d44f8..250cd58 100644
--- a/init.lua
+++ b/init.lua
@@ -104,11 +104,11 @@ coloredwood.greys2 = {
 }
 
 coloredwood.greys3 = {
-	"black",
-	"darkgrey_paint",
-	"mediumgrey_paint",
-	"lightgrey_paint",
-	"white_paint"
+	"dye:black",
+	"dye:dark_grey",
+	"dye:grey",
+	"dye:light_grey",
+	"dye:white"
 }
 
 -- All of the actual code is contained in separate lua files:
diff --git a/stick.lua b/stick.lua
index cd26d3a..05fb3f4 100644
--- a/stick.lua
+++ b/stick.lua
@@ -112,7 +112,6 @@ for grey = 1,5 do
 
 	local greyname = coloredwood.greys[grey]
 	local greyname2 = coloredwood.greys2[grey]
-	local greyname3 = coloredwood.greys3[grey]
 
 	local greyshadename = colored_block_modname..":stick_"..greyname
 	local pngname       = colored_block_modname.."_stick_"..greyname..".png"
diff --git a/wood.lua b/wood.lua
index 5e00c5f..256d3fb 100644
--- a/wood.lua
+++ b/wood.lua
@@ -223,7 +223,7 @@ for grey = 1,5 do
 		recipe = {
 			neutral_block,
 			neutral_block,
-			"unifieddyes:"..greyname3
+			greyname3
 		},
 	})