From df21df2bce497a19dd9cefed3999ba2b744b629c Mon Sep 17 00:00:00 2001 From: Jean-Patrick Guerrero Date: Sat, 4 Apr 2020 20:56:51 +0200 Subject: [PATCH] Add icon when no recipes --- init.lua | 20 +++++++++++++------- textures/craftguide_no.png | Bin 0 -> 2946 bytes 2 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 textures/craftguide_no.png diff --git a/init.lua b/init.lua index 5463e92..0c85a06 100644 --- a/init.lua +++ b/init.lua @@ -47,9 +47,9 @@ local ES = function(...) return ESC(S(...)) end -local maxn, sort, concat, copy, insert, remove = +local maxn, sort, concat, copy, insert, remove, unpack = table.maxn, table.sort, table.concat, table.copy, - table.insert, table.remove + table.insert, table.remove, unpack local fmt, find, gmatch, match, sub, split, upper, lower = string.format, string.find, string.gmatch, string.match, @@ -79,6 +79,7 @@ local PNG = { fire_anim = "craftguide_fire_anim.png", book = "craftguide_book.png", sign = "craftguide_sign.png", + nothing = "craftguide_no.png", selected = "craftguide_selected.png", furnace_anim = "craftguide_furnace_anim.png", @@ -931,7 +932,7 @@ local function get_panels(data, fs) } if data.fs_version >= 3 and not sfinv_only then - panels.favs = {dat = {}, height = 2.19} + panels.favs = {height = 2.19} elseif sfinv_only then panels = data.show_usages and @@ -966,7 +967,7 @@ local function get_panels(data, fs) end end - local rn = #v.dat + local rn = v.dat and #v.dat or -1 local _rn = tostring(rn) local xu = tostring(data.unum) .. _rn local xr = tostring(data.rnum) .. _rn @@ -974,10 +975,15 @@ local function get_panels(data, fs) xr = max(-0.3, -((#xr - 3) * 0.05)) local is_recipe = sfinv_only and not data.show_usages or k == 2 - local lbl + local lbl = "" if not sfinv_only and rn == 0 then - lbl = clr("#f00", is_recipe and ES"No recipes" or ES"No usages") + fs[#fs + 1] = fmt(FMT.image, + XOFFSET - 0.7, YOFFSET - 0.4 + spacing, 2, 2, PNG.nothing) + + fs[#fs + 1] = fmt(FMT.tooltip, + XOFFSET - 0.7, YOFFSET - 0.4 + spacing, 2, 2, + is_recipe and ES"No recipes" or ES"No usages") elseif (not sfinv_only and is_recipe) or (sfinv_only and not data.show_usages) then @@ -1016,7 +1022,7 @@ local function get_panels(data, fs) end end - local rcp = is_recipe and v.dat[data.rnum] or v.dat[data.unum] + local rcp = v.dat and (is_recipe and v.dat[data.rnum] or v.dat[data.unum]) if rcp then get_grid_fs(data, fs, rcp, spacing) end diff --git a/textures/craftguide_no.png b/textures/craftguide_no.png new file mode 100644 index 0000000000000000000000000000000000000000..14d7f6b1f445365071d2ba626681a21b8e351dbe GIT binary patch literal 2946 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 literal 0 HcmV?d00001