From 4c1caed41b626b32cc9efc446195d472adad57d5 Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Sun, 5 Feb 2017 23:43:15 +0100
Subject: [PATCH] Craftguide: Add icon for shapeless recipes

---
 mods/craftguide/init.lua                      |  20 ++++++++++++------
 .../textures/craftguide_furnace.png           | Bin 3365 -> 0 bytes
 .../textures/craftguide_shapeless.png         | Bin 0 -> 228 bytes
 3 files changed, 14 insertions(+), 6 deletions(-)
 delete mode 100644 mods/craftguide/textures/craftguide_furnace.png
 create mode 100644 mods/craftguide/textures/craftguide_shapeless.png

diff --git a/mods/craftguide/init.lua b/mods/craftguide/init.lua
index d1b07c4b..4d019e4a 100644
--- a/mods/craftguide/init.lua
+++ b/mods/craftguide/init.lua
@@ -100,21 +100,29 @@ function craftguide:get_recipe(iY, xoffset, tooltip, item, recipe_num, recipes)
 				recipe_num.." of "..recipes_total.."]"
 	end
 	local recipe_type = recipes[recipe_num].type
-	if recipe_type == "cooking" then
-		formspec = formspec..
-			"image["..(xoffset-0.8)..","..(iY+1)..
-				".5;0.5,0.5;craftguide_furnace.png]"
-	end
 
 	local items = recipes[recipe_num].items
 	local width = recipes[recipe_num].width
-	if width == 0 then
+	local is_shapeless = false
+	if recipe_type == "normal" and width == 0 then
+		is_shapeless = true
 		if #items <= 4 then
 			width = 2
 		else
 			width = min(3, #items)
 		end
 	end
+
+	if recipe_type == "cooking" then
+		formspec = formspec..
+			"image["..(xoffset-0.8)..","..(iY+1)..
+				".5;0.5,0.5;default_furnace_front_active.png]"
+	elseif is_shapeless then
+		formspec = formspec..
+			"image["..(xoffset-0.8)..","..(iY+1)..
+				".5;0.5,0.5;craftguide_shapeless.png]"
+	end
+
 	local rows = ceil(maxn(items) / width)
 	local btn_size, craftgrid_limit = 1, 5
 
diff --git a/mods/craftguide/textures/craftguide_furnace.png b/mods/craftguide/textures/craftguide_furnace.png
deleted file mode 100644
index 4c12e506cc9d5a9710cce3aa8def69472843ced7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3365
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
GLK6T0_fC8O

diff --git a/mods/craftguide/textures/craftguide_shapeless.png b/mods/craftguide/textures/craftguide_shapeless.png
new file mode 100644
index 0000000000000000000000000000000000000000..511652fd0d6c494758ab25d86498f31ca5e8e067
GIT binary patch
literal 228
zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4i*Lm2CurW#S9D#jKx9jP7LeL$-HD>U|>q}
zc6VW5Sk<d+#K6G7S>O>_%)r2V9fTR3G-g*YFfg!}c>21sKV)JRQ)CZonitN%z>wkT
z;uvCa`fRWx7lQ)F=e5;M|JkiumZVI(qPX|uwGyd|>WrGgT_POw0~C}aHMhNJwLYPq
zqNVM6-$(RD!;R9tGZ+_!y%KV&*u~EBq4z#(t6`au^OH+=W)!~6;&-2|cmLAm?7hGE
czvP<~B>ZcO=FwQoz`(%Z>FVdQ&MBb@06bGlW&i*H

literal 0
HcmV?d00001