From f70cb29214ab245876520bb4a1879332977467d3 Mon Sep 17 00:00:00 2001
From: Jean-Patrick Guerrero <jeanpatrick.guerrero@gmail.com>
Date: Sun, 20 Dec 2020 02:04:35 +0100
Subject: [PATCH] More design improvements

---
 init.lua                   |  17 +++++++++++++----
 textures/craftguide_no.png | Bin 1670 -> 0 bytes
 2 files changed, 13 insertions(+), 4 deletions(-)
 delete mode 100644 textures/craftguide_no.png

diff --git a/init.lua b/init.lua
index 40b8eb9..cbce575 100644
--- a/init.lua
+++ b/init.lua
@@ -86,7 +86,7 @@ local PNG = {
 	fire_anim = "craftguide_fire_anim.png",
 	book = "craftguide_book.png",
 	sign = "craftguide_sign.png",
-	nothing = "craftguide_no.png",
+	cancel = "craftguide_cancel.png",
 	selected = "craftguide_selected.png",
 	furnace_anim = "craftguide_furnace_anim.png",
 
@@ -118,6 +118,7 @@ local styles = sprintf([[
 		   sound=craftguide_click]
 
 	style[filter;border=false]
+	style[cancel;fgimg=%s;fgimg_hovered=%s^[brighten;fgimg_pressed=%s^[brighten]
 	style[search;fgimg=%s;fgimg_hovered=%s]
 	style[prev_page;fgimg=%s;fgimg_hovered=%s;fgimg_pressed=%s]
 	style[next_page;fgimg=%s;fgimg_hovered=%s;fgimg_pressed=%s]
@@ -131,6 +132,7 @@ local styles = sprintf([[
 	      bgimg_pressed=craftguide_btn9_pressed.png;bgimg_middle=4,6]
 ]],
 PNG.selected, PNG.selected,
+PNG.cancel, PNG.cancel, PNG.cancel,
 PNG.search, PNG.search_hover,
 PNG.prev, PNG.prev_hover, PNG.prev_hover,
 PNG.next, PNG.next_hover, PNG.next_hover,
@@ -223,6 +225,13 @@ local group_names = {
 craftguide.model_alias = {
 	["boats:boat"] = {name = "boats:boat", drawtype = "entity"},
 	["carts:cart"] = {name = "carts:cart", drawtype = "entity", frames = "0,0"},
+	["default:chest"] = {name = "default:chest_open"},
+	["default:chest_locked"] = {name = "default:chest_locked_open"},
+	["doors:door_wood"] = {name = "doors:door_wood_a"},
+	["doors:door_glass"] = {name = "doors:door_glass_a"},
+	["doors:door_obsidian_glass"] = {name = "doors:door_obsidian_glass_a"},
+	["doors:door_steel"] = {name = "doors:door_steel_a"},
+	["xpanes:door_steel_bar"] = {name = "xpanes:door_steel_bar_a"},
 }
 
 local function err(str)
@@ -1336,7 +1345,7 @@ local function get_model_fs(fs, data, def, model_alias)
 
 	fs(fmt("model",
 		data.xoffset + 6.6, data.yoffset + 0.05, 1.3, 1.3, "",
-		def.mesh, concat(t, ","), model_alias.frames or ""))
+		def.mesh, concat(t, ","), model_alias and model_alias.frames or ""))
 end
 
 local function get_title_fs(fs, data)
@@ -1353,7 +1362,7 @@ local function get_title_fs(fs, data)
 		   sprintf("tooltip[fav;%s]", fav and ES"Unmark this item" or ES"Mark this item"))
 	else
 		fs(sprintf("style[nofav;fgimg=%s;fgimg_hovered=%s;fgimg_pressed=%s]",
-			"craftguide_fav_off.png", PNG.nothing, PNG.nothing),
+			"craftguide_fav_off.png", PNG.cancel, PNG.cancel),
 		   fmt("image_button", star_x, star_y, star_size, star_size, "", "nofav", ""),
 		   sprintf("tooltip[nofav;%s]", ES"Cannot mark this item. Bookmark limit reached."))
 	end
@@ -1532,7 +1541,7 @@ local function make_fs(data)
 	   fmt("image_button", 4.25, 0.14, 0.7, 0.7, "", "search", ""))
 
 	if data.filter ~= "" then
-		fs(fmt("image_button", 3.75, 0.35, 0.3, 0.3, "craftguide_cancel.png", "cancel", ""))
+		fs(fmt("image_button", 3.75, 0.35, 0.3, 0.3, PNG.cancel, "cancel", ""))
 	end
 
 	fs(fmt("image_button", data.xoffset - 3.2, 0.15, 0.7, 0.7, "", "prev_page", ""),
diff --git a/textures/craftguide_no.png b/textures/craftguide_no.png
deleted file mode 100644
index 703f16b546ae7f1f0d906dfe42e3cb15b0c944c9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1670
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
Q%>V!Z07*qoM6N<$f{CsN_W%F@