From 60d7a6d213f335ea4aff5b5e303e30f344d5912a Mon Sep 17 00:00:00 2001
From: Vanessa Dannenberg <vanessa.e.dannenberg@gmail.com>
Date: Mon, 8 Mar 2021 09:53:25 -0500
Subject: [PATCH] Draw the trash slot by overlaying the bare trash can icon
 over the single slot image instead of baking it in.

---
 bags.lua                        |   6 +++---
 init.lua                        |   3 +++
 register.lua                    |   3 +--
 textures/ui_trash_slot.png      | Bin 1056 -> 0 bytes
 textures/ui_trash_slot_icon.png | Bin 0 -> 782 bytes
 5 files changed, 7 insertions(+), 5 deletions(-)
 delete mode 100644 textures/ui_trash_slot.png
 create mode 100644 textures/ui_trash_slot_icon.png

diff --git a/bags.lua b/bags.lua
index 30e7f7f..2510181 100644
--- a/bags.lua
+++ b/bags.lua
@@ -74,9 +74,9 @@ for bag_i = 1, 4 do
 			if ui.trash_enabled
 					or ui.is_creative(player_name)
 					or minetest.get_player_privs(player_name).give then
-				formspec[n] = "image[7.8,0.25;"..ui.imgscale..","..ui.imgscale..";ui_trash_slot.png]"
-						.. "list[detached:trash;main;7.95,0.25;1,1;]"
-				n = n + 1
+					formspec[n] = "image[7.8,0.25;"..ui.trash_slot_img.."]"
+					formspec[n+1] = "list[detached:trash;main;7.95,0.25;1,1;]"
+				n = n + 2
 			end
 			local inv = player:get_inventory()
 			for i = 1, 4 do
diff --git a/init.lua b/init.lua
index 53a4287..f3edf99 100644
--- a/init.lua
+++ b/init.lua
@@ -102,6 +102,9 @@ for _, style in ipairs({ui.style_full, ui.style_lite}) do
                               ui.imgscale*8, ui.imgscale*4)
 end
 
+ui.trash_slot_img =         string.format("%f,%f;ui_single_slot.png^(ui_trash_slot_icon.png^[opacity:95)",
+                              ui.imgscale, ui.imgscale)
+
 -- Disable default creative inventory
 local creative = rawget(_G, "creative") or rawget(_G, "creative_inventory")
 if creative then
diff --git a/register.lua b/register.lua
index 52afa05..536dfc3 100644
--- a/register.lua
+++ b/register.lua
@@ -187,8 +187,7 @@ ui.register_page("craft", {
 
 		if ui.trash_enabled or ui.is_creative(player_name) or minetest.get_player_privs(player_name).give then
 			formspec[n] = string.format("label[%f,%f;%s]", craftx + 6.45, crafty + 2.4, F(S("Trash:")))
-			formspec[n+1] = string.format("image[%f,%f;%f,%f;ui_trash_slot.png]",
-				craftx+6.25, crafty + 2.5, ui.imgscale, ui.imgscale)
+			formspec[n+1] = string.format("image[%f,%f;%s]", craftx+6.25, crafty + 2.5, ui.trash_slot_img)
 			formspec[n+2] = string.format("list[detached:trash;main;%f,%f;1,1;]", craftx + 6.4, crafty + 2.65)
 			n=n+3
 		end
diff --git a/textures/ui_trash_slot.png b/textures/ui_trash_slot.png
deleted file mode 100644
index 4bd4909d598535d717a886151f481fc378c8835e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1056
zcmV+*1mF9KP)<h;3K|Lk000e1NJLTq002M$002M;1ONa40ARUQ000B$Nkl<ZXx{CZ
zO=~1o6o#MsRduWSD;eU9BbmsAECxYG1IjRN2C@iQ_#^xaS?WHx3ho76xtg6IV;0$o
z3<%k{5`t*kLKK}zPp2!LbX8p!)oD6kZC6sM88D|deY>jqK7G!)?>YCvOEz)(t9Q@{
zT*1>A1TjCJx}!%2Z&Tw3p+nQao`rT%a|pCkJ=G>!aUH%t+XEl)ySO{&EtzGrplZk>
zJs?pjopd|hNH&|zyY8FQ03UK-t1H23xEO>!23e#F07yybNBymM{oqO1`}#P*0}@;R
zxcW(Lwt~e&AqoX>I8qW4V*0KA+TmAT?@Is_z<c~HUjL}RHZ|Lzf<+?{1z!?1xJ+H&
zH`~e2k9Z1Mr0dMhg{!sM8X;b>!9TGU6b6rQwz4`k=MS<2cq;5tWwAnlE<Ez5AtZ)i
zvAT3a3;-VRe&{U+p)Fzh3_;+9!LkfL&vd{;H@pS^N}YdF6%>^P+mKz*ppaJAOqP!&
znI@=t)(w?V2q{Z(|B)%A6k?c!=M;rfijd?b+ckjBUr^i_os(A!u+Lv~NzZj=zzo%#
z>6`<gPmAX$>Srp3qr)Cu?ozobfQT1>&mFuo?j|((hlpK*T!EMXAYqpn=#T(?o}J@?
z9ss*21d_&?m=^@tp*w6-`}}dP#shSTGN~;NAp2=|Vxmc(E&xDaFQWCu0chU5z%D@-
z=>bE+J^;bkqMgzs1-uF4p96HCUx?AnQyueE%x~-?nB}$Nbs#1lem<m4NJyK6DH7U*
z1Nlja5$9@UVa4c>7F`_A*dZB=O0S0Q*phVR16(&G*8u-_05@h-0)Qk$0|tv2j!Nl@
zGqcR2kle<hQOsXrU#TzV0dM4Gk)!rqIs~rpB+TW3l;=cayT^X+jjo>bF+)tspA&dU
zVu}awnC5_Vf)EJmxwa;H(p0&H<i(hs;ZZYMWhPfrPMiaV+uZ!mUMK$sHAfPPOUTW2
zF?z)SMi0Vec6eIuA>AlIc2eq0DoUJQp)sj)gM&(q>B&xZgj!D2JuH=u?j>0W9JIxD
zdH>(wQz6_A+I|M`Ejy9ia8WtaYXT}XqRNJfR*qJ|JtsEV;>wdzU<j#lgXt~1S#`r@
zcu2P?)<sL9QC9>ZP*|!onBi6{T#uW3gX#hN#3R(NcF()-)ioJLk(b6`38^y0P2OnL
z*2H5GKRn($e2Qm-6@OJNim>=#2oye5rlYAXf89NycW-!SXrECRYA#svm+gYBse(09
zrM44n`x|C6YHIh^2-=8!f#!}l3~LSFih>hCIny)kI11ek50Clglzm4HQ+OgO6pnX!
a<?LUQzVv^O-RyM$0000<MNUMnLSTaY!{Rak

diff --git a/textures/ui_trash_slot_icon.png b/textures/ui_trash_slot_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..d3a772316531cbbfbe40245edba60cd113af6626
GIT binary patch
literal 782
zcmV+p1M&QcP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0008jNkl<Zc-rll
zziSjx5XV2Wd%rhPykH|X!Pp8)un`P40c%B23tPd$%0dKd{{ykn#?pTvSc!!J6>CW%
z7Df><C&_J+z1`cfnZP9w^^(hF6XyeuJ@)Ztm+#KZ_q_whaU92S9LI4S$8nth4B6A*
zBBQF>1j>Cb%|xUXMbUD*-PQvqK)qg<wY9bLz+K=BQ0?Pc3Uq)u;As#9GkKmT2Q34}
zfoH%)U=4T&#Q(T91kM7-flt6~;AP=!sa!4x<#IVFl}aIS18CdVoCnT{$PwV^pN5DW
z1x^Apwl)VIi%4T5{-EExG@x2<rfGT;7_(a!fV%xY2HaBBrN8FBDpoGzJsEmQRUf2j
zngR*%!pfsiOaLG4i*@a)J)_&_&~4WL0xlOW1B}4Fm~1n*+t?fZL5e6q3Va?yrnUQM
zro(fAAPCBNo}Vzk*8#`Zo>(d(-&A$As5W@qEG)E|{Q&&fVPkEm>Ld`^tvPd)LNg64
z0?T%t-c)a;QW!;%08}cKO}5rMXPhztSFHKnFRTr2i8pFvYy8t$mR-rRY*s|xbUK}@
zW}DA}W|n1Fvn-p9qUco|$7<O*Vk0+u95}%cvtt6d2V7Lu8gL!B12lotHaFGjbYz$*
zJ4^w@dPC6j?69ZFh3xU+Y`+C4Brbpp-~zY+F2InjaJy}|?1uoQAwDa%z5GuRQB_^E
z!&3&V+T7Bi6+lGZs_HeM)o3(U;y8W?RKhS^%=7%m#$1}F`JoiRj<5>=aU27D1?YCW
zSQacC#uAWfwJLd@_f_9P5NMJl!9f%t>)G2^f$K?<Ozxn;sht#?J@>i?L4fbp$c_LN
zJMj&|r4r!F$jFGcTCL)Gs)&pNPwa(tK%)!1wj*<~GeA{WfJbI|Q})NmZu~t4-UE+o
zwc7mp`ud)3Oa_?=byXb$YP$@Th{%$v#yF1SIF92uj^j9v<2ZxiH&A5+U{JsFv;Y7A
M07*qoM6N<$g7WZbC;$Ke

literal 0
HcmV?d00001