From 9e83c219e7bc707c9366a7d5814850615ae12b7a Mon Sep 17 00:00:00 2001
From: Maksym H <Maksym48@pm.me>
Date: Tue, 22 Nov 2022 12:03:13 +0200
Subject: [PATCH] Move GUI textures in separate folder

---
 builtin/fstk/buttonbar.lua                    |  18 +++++++++++-------
 builtin/fstk/tabview.lua                      |  14 ++++++++------
 builtin/mainmenu/common.lua                   |   2 +-
 builtin/mainmenu/init.lua                     |   1 +
 textures/base/pack/btn_play.png               | Bin 1005 -> 0 bytes
 textures/base/pack/btn_play_hover.png         | Bin 984 -> 0 bytes
 textures/base/pack/{ => gui}/authors_menu.png | Bin
 .../pack/{ => gui}/authors_menu_hover.png     | Bin
 .../pack/{ => gui}/authors_menu_selected.png  | Bin
 textures/base/pack/{ => gui}/btn_down.png     | Bin
 .../base/pack/{ => gui}/btn_down_hover.png    | Bin
 textures/base/pack/{ => gui}/btn_download.png | Bin
 .../pack/{ => gui}/btn_download_hover.png     | Bin
 textures/base/pack/{ => gui}/btn_up.png       | Bin
 textures/base/pack/{ => gui}/btn_up_hover.png | Bin
 .../base/pack/{ => gui}/settings_menu.png     | Bin
 .../pack/{ => gui}/settings_menu_hover.png    | Bin
 .../pack/{ => gui}/settings_menu_selected.png | Bin
 textures/base/pack/{ => gui}/side_menu.png    | Bin
 .../base/pack/{ => gui}/side_menu_divider.png | Bin
 .../base/pack/{ => gui}/side_menu_left.png    | Bin
 .../pack/{ => gui}/upper_buttons_left.png     | Bin
 .../{ => gui}/upper_buttons_left_hover.png    | Bin
 .../{ => gui}/upper_buttons_left_selected.png | Bin
 .../pack/{ => gui}/upper_buttons_middle.png   | Bin
 .../{ => gui}/upper_buttons_middle_hover.png  | Bin
 .../upper_buttons_middle_selected.png         | Bin
 .../pack/{ => gui}/upper_buttons_right.png    | Bin
 .../{ => gui}/upper_buttons_right_hover.png   | Bin
 .../upper_buttons_right_selected.png          | Bin
 textures/base/pack/select_btn.png             | Bin 525 -> 0 bytes
 31 files changed, 21 insertions(+), 14 deletions(-)
 delete mode 100644 textures/base/pack/btn_play.png
 delete mode 100644 textures/base/pack/btn_play_hover.png
 rename textures/base/pack/{ => gui}/authors_menu.png (100%)
 rename textures/base/pack/{ => gui}/authors_menu_hover.png (100%)
 rename textures/base/pack/{ => gui}/authors_menu_selected.png (100%)
 rename textures/base/pack/{ => gui}/btn_down.png (100%)
 rename textures/base/pack/{ => gui}/btn_down_hover.png (100%)
 rename textures/base/pack/{ => gui}/btn_download.png (100%)
 rename textures/base/pack/{ => gui}/btn_download_hover.png (100%)
 rename textures/base/pack/{ => gui}/btn_up.png (100%)
 rename textures/base/pack/{ => gui}/btn_up_hover.png (100%)
 rename textures/base/pack/{ => gui}/settings_menu.png (100%)
 rename textures/base/pack/{ => gui}/settings_menu_hover.png (100%)
 rename textures/base/pack/{ => gui}/settings_menu_selected.png (100%)
 rename textures/base/pack/{ => gui}/side_menu.png (100%)
 rename textures/base/pack/{ => gui}/side_menu_divider.png (100%)
 rename textures/base/pack/{ => gui}/side_menu_left.png (100%)
 rename textures/base/pack/{ => gui}/upper_buttons_left.png (100%)
 rename textures/base/pack/{ => gui}/upper_buttons_left_hover.png (100%)
 rename textures/base/pack/{ => gui}/upper_buttons_left_selected.png (100%)
 rename textures/base/pack/{ => gui}/upper_buttons_middle.png (100%)
 rename textures/base/pack/{ => gui}/upper_buttons_middle_hover.png (100%)
 rename textures/base/pack/{ => gui}/upper_buttons_middle_selected.png (100%)
 rename textures/base/pack/{ => gui}/upper_buttons_right.png (100%)
 rename textures/base/pack/{ => gui}/upper_buttons_right_hover.png (100%)
 rename textures/base/pack/{ => gui}/upper_buttons_right_selected.png (100%)
 delete mode 100644 textures/base/pack/select_btn.png

diff --git a/builtin/fstk/buttonbar.lua b/builtin/fstk/buttonbar.lua
index c051d7aa8..5b480d82f 100644
--- a/builtin/fstk/buttonbar.lua
+++ b/builtin/fstk/buttonbar.lua
@@ -23,7 +23,8 @@ local function buttonbar_formspec(self)
 	end
 
 	local formspec = string.format("background9[%f,%f;%f,%f;%sside_menu_left.png;false;30]",
-			self.pos.x, self.pos.y - 0.1, self.size.x + 0.025, self.size.y + 0.35, defaulttexturedir_esc)
+			self.pos.x, self.pos.y - 0.1, self.size.x + 0.025, self.size.y + 0.35,
+			defaulttexturedir_esc .. "gui" .. DIR_DELIM_esc)
 
 	for i=self.startbutton,#self.buttons,1 do
 		local btn_name = self.buttons[i].name
@@ -59,9 +60,10 @@ local function buttonbar_formspec(self)
 			end
 
 			if button.cdb then
+				local tpath = defaulttexturedir_esc .. "gui" .. DIR_DELIM_esc
 				formspec = formspec ..
-					"style[" .. btn_name .. ";bgimg=" .. defaulttexturedir_esc ..
-						"btn_download.png;bgimg_hovered=" .. defaulttexturedir_esc .. "btn_download_hover.png]" ..
+					"style[" .. btn_name .. ";bgimg=" .. tpath ..
+						"btn_download.png;bgimg_hovered=" .. tpath .. "btn_download_hover.png]" ..
 
 					("image_button[%f,%f;%f,%f;;%s;%s;true;%s]tooltip[%s;%s]"):format(
 						btn_pos.x, btn_pos.y, self.btn_size, self.btn_size,
@@ -117,16 +119,18 @@ local function buttonbar_formspec(self)
 					btn_inc_pos.x, btn_inc_pos.y, btn_size.x, btn_size.y,
 					self.name, text_inc)
 		else
+			local tpath = defaulttexturedir_esc .. "gui" .. DIR_DELIM_esc
+
 			formspec = formspec ..
-				"style[btnbar_dec_" .. self.name .. ";bgimg=" .. defaulttexturedir_esc ..
-					"btn_up.png;bgimg_hovered=" .. defaulttexturedir_esc .. "btn_up_hover.png]" ..
+				"style[btnbar_dec_" .. self.name .. ";bgimg=" .. tpath ..
+					"btn_up.png;bgimg_hovered=" .. tpath .. "btn_up_hover.png]" ..
 				("image_button[%f,%f;%f,%f;;btnbar_dec_%s;;true;false]"):format(
 					btn_dec_pos.x, btn_dec_pos.y, btn_size.x, btn_size.y,
 					self.name)
 
 			formspec = formspec ..
-				"style[btnbar_inc_" .. self.name .. ";bgimg=" .. defaulttexturedir_esc ..
-					"btn_down.png;bgimg_hovered=" .. defaulttexturedir_esc .. "btn_down_hover.png]" ..
+				"style[btnbar_inc_" .. self.name .. ";bgimg=" .. tpath ..
+					"btn_down.png;bgimg_hovered=" .. tpath .. "btn_down_hover.png]" ..
 				("image_button[%f,%f;%f,%f;;btnbar_inc_%s;;true;false]"):format(
 					btn_inc_pos.x, btn_inc_pos.y, btn_size.x, btn_size.y,
 					self.name)
diff --git a/builtin/fstk/tabview.lua b/builtin/fstk/tabview.lua
index 8c54ea93f..9360839a2 100644
--- a/builtin/fstk/tabview.lua
+++ b/builtin/fstk/tabview.lua
@@ -69,13 +69,14 @@ end
 
 --------------------------------------------------------------------------------
 local function make_side_pane_tab(y, tab_name, tooltip, selected)
+	local tpath = defaulttexturedir_esc .. "gui" .. DIR_DELIM_esc
 	local formspec = "style[" .. tab_name .. "_tab;bgimg=" ..
-			defaulttexturedir_esc .. tab_name
+			tpath .. tab_name
 	if selected then
 		formspec = formspec .. "_menu_selected.png]"
 	else
 		formspec = formspec .. "_menu.png;bgimg_hovered=" ..
-				defaulttexturedir_esc .. tab_name .. "_menu_hover.png]"
+				tpath .. tab_name .. "_menu_hover.png]"
 	end
 
 	return formspec ..
@@ -92,6 +93,7 @@ local function get_formspec(self)
 		if self.parent == nil then
 			local tsize = self.tablist[self.last_tab_index].tabsize or
 					{width=self.width, height=self.height}
+			local tpath = defaulttexturedir_esc .. "gui" .. DIR_DELIM_esc
 			formspec = formspec ..
 					string.format("size[%f,%f,%s]",tsize.width + 2,tsize.height + 1,
 						dump(self.fixed_size)) ..
@@ -102,9 +104,9 @@ local function get_formspec(self)
 						tsize.height + 1.75 .. ";" .. defaulttexturedir_esc ..
 						"bg_common.png;false;40]" ..
 
-					"background9[12.13,1.05;0.9,2.6;" .. defaulttexturedir_esc .. "side_menu.png;false;30]" ..
+					"background9[12.13,1.05;0.9,2.6;" .. tpath .. "side_menu.png;false;30]" ..
 					make_side_pane_tab(0.9, "settings", fgettext("Settings"), name == "settings") ..
-					"image[12.15,2.26;0.9,0.06;" .. defaulttexturedir_esc .. "side_menu_divider.png]" ..
+					"image[12.15,2.26;0.9,0.06;" .. tpath .. "side_menu_divider.png]" ..
 					make_side_pane_tab(2.3, "authors", fgettext("Credits"), name == "credits")
 		end
 
@@ -237,13 +239,13 @@ local function button_header(self)
 		local btn_name = self.name .. "_" .. i
 		toadd = toadd ..
 			"style[" .. btn_name .. ";padding=-10;bgimg=" .. defaulttexturedir_esc ..
-				texture
+				DIR_DELIM_esc .. "gui" .. DIR_DELIM_esc .. texture
 
 		if i == math.abs(self.last_tab_index) then
 			toadd = toadd .. "_selected.png;"
 		else
 			toadd = toadd .. ".png;bgimg_hovered=" .. defaulttexturedir_esc ..
-				texture .. "_hover.png;"
+				DIR_DELIM_esc .. "gui" .. DIR_DELIM_esc .. texture .. "_hover.png;"
 		end
 
 		toadd = toadd .. "bgimg_middle=20;content_offset=0]" ..
diff --git a/builtin/mainmenu/common.lua b/builtin/mainmenu/common.lua
index 4bea5fdec..7c31a3649 100644
--- a/builtin/mainmenu/common.lua
+++ b/builtin/mainmenu/common.lua
@@ -314,7 +314,7 @@ function is_high_dpi()
 end
 --------------------------------------------------------------------------------
 function btn_style(field, color)
-	local button_path = defaulttexturedir_esc .. "gui" .. DIR_DELIM
+	local button_path = defaulttexturedir_esc .. "gui" .. DIR_DELIM_esc
 	local btn_size = is_high_dpi() and ".x2" or ""
 	color = (color and "_" .. color) or ""
 
diff --git a/builtin/mainmenu/init.lua b/builtin/mainmenu/init.lua
index 516b0609e..6bfc861bb 100644
--- a/builtin/mainmenu/init.lua
+++ b/builtin/mainmenu/init.lua
@@ -27,6 +27,7 @@ local mobile = PLATFORM == "Android" or PLATFORM == "iOS"
 defaulttexturedir = core.get_texturepath_share() .. DIR_DELIM .. "base" ..
 					DIR_DELIM .. "pack" .. DIR_DELIM
 defaulttexturedir_esc = core.formspec_escape(defaulttexturedir)
+DIR_DELIM_esc = core.formspec_escape(DIR_DELIM) -- for use in formspecs only
 
 dofile(basepath .. "common" .. DIR_DELIM .. "filterlist.lua")
 dofile(basepath .. "fstk" .. DIR_DELIM .. "buttonbar.lua")
diff --git a/textures/base/pack/btn_play.png b/textures/base/pack/btn_play.png
deleted file mode 100644
index c59fde69f15c7574b87fa1aca3f9a11ca5c19d37..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1005
zcmV<J0}}j+P)<h;3K|Lk000e1NJLTq00E)^003qP0{{R3zT0I>0001TP)t-sb)MR0
zl-5{^(n^5OvBB=d(DJ0V>!Y>nn5^iKrRIpA<uhx&+Tr(Zir!p&)c^ngf|}!jnd2x_
zltgI5h@j<6fzK5Y9njFweU{>Wmg0St;evvK-{0R}US5Bg;xksRho9w$pyrjT=pa6a
z9Xx6=RjqzGB}f1O12#!SK~#7F?cD`(BQX$#VQ0w9%((Zz;>y!@I;1Mqv=yl*@81nd
z4(LnCY&WR4x5Sj9NJ^3h2O<ST#FJ&YDf>|IsM#zYwLFH}Wu3A#?RJSt2N8&pq$ql2
zImJ*+#R1D>gw!_;280Bn_=#wn>-C1iEE`p9JeD4k-pXg&=LimAndLJgnoJTCh%^x0
zPbl<y4Aco2dMXS|)2TrMkqV+T&GTNbK0LFT%ctDOd5-g-a3)zyO|;diAOevoCLpAZ
z2t@OFmN5|}Ihnn9ZzM=?qE~Hti9nR5M8w0gh=-9-6(+qzAR-_+(b5E@YTLL{A`qEA
z1FZxR5hJaTW1lxWT|^)%3ML{TIgwwa^?DUy@}EvW5r`N_PV{=Dp`{-tso(4r5`oC%
zf#}6ZLu+vmfe1wHwl5+Z(q^-=M&m9-6o^0+nyA(COT<X>jn2kaZz2$ZNRDJ*{rVGu
z2t;xuI}sHH5r{x!@=wG_0f{PJel#ot5r{$)F;c*j3&S4*5r`BKF;cLzuEQS#5r`BJ
z36VTpjA{`E5r`BJF;Wy)>46ADN{I+5lAD)+2t+E0w%h7N!bx^#5P?Vu5dj4wViGG6
z6)zEpKtw=+h=xNaA}UTI5P^t+0uZ^azQqwlAPPVv01^_}ra7Myh=T}3AQAw{iKt2&
z9Tfu+h(II&5)ql~>nb=U03r|tAQA%!mdU>OAOevhqTQ#e0ST7LzW5*lkxC*vkeWag
zAQ06J==X`*Z4mu+qT!=@0D(vnh&CGmky@at7ovg)M6Z0{O|3vwcp%+GAflv1dlLg`
zd(hf&K$?j_bU3uzj3kSR2*~+~b$Hx9yZ#Z7>3Gyi1ftXFRYVMg-2NO1NGB194hJTp
z@Dx)4A|56(X(9qqzu#&Rk~{|L{7UDukAu)0_d)s0&p?;U^?E$sZd!;y)Hk(EgcLSJ
zKpKfabT~Ybd_bK}Zu5Zi1Uek9CM`rDN|HO$V8BQmgZT?6lm$oy5r`U%G#vyCP2c-h
zb~O<Z0VyB?QMuK1yMv&ik4$$S0#ZQ)B0@5C1BWJ$h=+l65P^u0P)re!3L+3i3<Vq|
bL?HSPkR4FwDrTZH00000NkvXXu0mjfq=KJ8

diff --git a/textures/base/pack/btn_play_hover.png b/textures/base/pack/btn_play_hover.png
deleted file mode 100644
index e87bf586203213ac87f771f07f68942fbed90919..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 984
zcmV;}11J26P)<h;3K|Lk000e1NJLTq00E)^003qP0{{R3zT0I>0001NP)t-sb)MR6
znAcyA)w;;=%hvR-zwNHR?WDHrov`Vas_096#op!kf0*KLi`oDG|B<HVkfr89XrWqq
z%9g9>VUX1^EjZTJ){LU%jiTj|k&)x$<8g6uj-=&FYPglE=$5PLqO|KeRh2kXd`W4y
zXCUak0009gNkl<ZcmeI*hfX6g6op|tlinLWec%5b_fE(GEX7(YH;#R?=cj{B@rSJR
zc|uOASRpz0<W)8iiNI6WEvf!h`&_4k_qqvVy;J>DRW%qmXNQPH&b8aaQw@?21uB#l
zi+v%Dr12O?Hi$?x98M;6J-xEoOg9s6^`paMbTj->>H8v@&z(df3q;Kch2iiAsLwJ6
zg|W0)2oi}*5LH#HH5`)XJ}sBAObbbfBojm=k_c2%)`&>7TGcg(kmh9e^LJBy`A+y|
z_|5DRk*KP^h&&!e0J;W=LBTK)iIhMfdXb29-9~AYh(wYP^r{F%K#HBm{LRi55sBJu
z5b1$Hlpg8r?X}DlznOg^66t|_qT3=(0$mtnezP-3L?S5_(e02X!AL}+GKhM;R75~Z
zL4<M>k%&ayZaN|#Nlz4FBN2%nn@EooUVRdg=+TM7NO~ev1QCfyB&8<;QdXj<%a20S
z@)MDWL_o@Ta$#~IQ$!>p5s<Q-b)8(y6cLF?1f={Iqx!;@h)6^tAQf?yo=GASkqAhI
z+`Pmj5s66j{(e1?a?m7@5h4<i2te70CX*N<sZ1ggkqAK9h$fQ=B2+37iAV&X3`CKu
zKM9n9h(sh(0I7&V!=g_KltDxy5-EVRMCgi*4wXPeA`&TpR76r>U3I4fG7yo7L<%7F
zGKCl45D|$;^x@?LB_u-O#WzVrA`<yPHX~8aNc1>B_a*A}Nc6uGP0l?M5Q%a`A|J@k
z!vjt(7W12th(vlM5ZT`3!a%75ka;2!Nm`;$DGkuuTMnYszZrlm6Om}W?nyw>1tI{&
zA6N%p4}bLV0Z7_xtP+uEyS)_=fLPqWBY<oYk!ZaJ5z2UoDIQ)5M3N;U5{*VUjK97g
zp#I(3?fx}DGap}#PB9li`~Bgt*&L5nh)6V&x)P9Bz5ryAh(zl(kWxTxw{hc$1EBT#
zAXy<Ik#h~wcnl;jfU#sKC;()Fh(u4a)s0!k7T^6j)$o9*0kS|uqGqcb48|;LznL1I
z2FMH%i6kctSmx&EzylxyL?i-IK`{WCAR<x0P{c7pM54d8R;VATA~EOy0000<MNUMn
GLSTZw#ISV$

diff --git a/textures/base/pack/authors_menu.png b/textures/base/pack/gui/authors_menu.png
similarity index 100%
rename from textures/base/pack/authors_menu.png
rename to textures/base/pack/gui/authors_menu.png
diff --git a/textures/base/pack/authors_menu_hover.png b/textures/base/pack/gui/authors_menu_hover.png
similarity index 100%
rename from textures/base/pack/authors_menu_hover.png
rename to textures/base/pack/gui/authors_menu_hover.png
diff --git a/textures/base/pack/authors_menu_selected.png b/textures/base/pack/gui/authors_menu_selected.png
similarity index 100%
rename from textures/base/pack/authors_menu_selected.png
rename to textures/base/pack/gui/authors_menu_selected.png
diff --git a/textures/base/pack/btn_down.png b/textures/base/pack/gui/btn_down.png
similarity index 100%
rename from textures/base/pack/btn_down.png
rename to textures/base/pack/gui/btn_down.png
diff --git a/textures/base/pack/btn_down_hover.png b/textures/base/pack/gui/btn_down_hover.png
similarity index 100%
rename from textures/base/pack/btn_down_hover.png
rename to textures/base/pack/gui/btn_down_hover.png
diff --git a/textures/base/pack/btn_download.png b/textures/base/pack/gui/btn_download.png
similarity index 100%
rename from textures/base/pack/btn_download.png
rename to textures/base/pack/gui/btn_download.png
diff --git a/textures/base/pack/btn_download_hover.png b/textures/base/pack/gui/btn_download_hover.png
similarity index 100%
rename from textures/base/pack/btn_download_hover.png
rename to textures/base/pack/gui/btn_download_hover.png
diff --git a/textures/base/pack/btn_up.png b/textures/base/pack/gui/btn_up.png
similarity index 100%
rename from textures/base/pack/btn_up.png
rename to textures/base/pack/gui/btn_up.png
diff --git a/textures/base/pack/btn_up_hover.png b/textures/base/pack/gui/btn_up_hover.png
similarity index 100%
rename from textures/base/pack/btn_up_hover.png
rename to textures/base/pack/gui/btn_up_hover.png
diff --git a/textures/base/pack/settings_menu.png b/textures/base/pack/gui/settings_menu.png
similarity index 100%
rename from textures/base/pack/settings_menu.png
rename to textures/base/pack/gui/settings_menu.png
diff --git a/textures/base/pack/settings_menu_hover.png b/textures/base/pack/gui/settings_menu_hover.png
similarity index 100%
rename from textures/base/pack/settings_menu_hover.png
rename to textures/base/pack/gui/settings_menu_hover.png
diff --git a/textures/base/pack/settings_menu_selected.png b/textures/base/pack/gui/settings_menu_selected.png
similarity index 100%
rename from textures/base/pack/settings_menu_selected.png
rename to textures/base/pack/gui/settings_menu_selected.png
diff --git a/textures/base/pack/side_menu.png b/textures/base/pack/gui/side_menu.png
similarity index 100%
rename from textures/base/pack/side_menu.png
rename to textures/base/pack/gui/side_menu.png
diff --git a/textures/base/pack/side_menu_divider.png b/textures/base/pack/gui/side_menu_divider.png
similarity index 100%
rename from textures/base/pack/side_menu_divider.png
rename to textures/base/pack/gui/side_menu_divider.png
diff --git a/textures/base/pack/side_menu_left.png b/textures/base/pack/gui/side_menu_left.png
similarity index 100%
rename from textures/base/pack/side_menu_left.png
rename to textures/base/pack/gui/side_menu_left.png
diff --git a/textures/base/pack/upper_buttons_left.png b/textures/base/pack/gui/upper_buttons_left.png
similarity index 100%
rename from textures/base/pack/upper_buttons_left.png
rename to textures/base/pack/gui/upper_buttons_left.png
diff --git a/textures/base/pack/upper_buttons_left_hover.png b/textures/base/pack/gui/upper_buttons_left_hover.png
similarity index 100%
rename from textures/base/pack/upper_buttons_left_hover.png
rename to textures/base/pack/gui/upper_buttons_left_hover.png
diff --git a/textures/base/pack/upper_buttons_left_selected.png b/textures/base/pack/gui/upper_buttons_left_selected.png
similarity index 100%
rename from textures/base/pack/upper_buttons_left_selected.png
rename to textures/base/pack/gui/upper_buttons_left_selected.png
diff --git a/textures/base/pack/upper_buttons_middle.png b/textures/base/pack/gui/upper_buttons_middle.png
similarity index 100%
rename from textures/base/pack/upper_buttons_middle.png
rename to textures/base/pack/gui/upper_buttons_middle.png
diff --git a/textures/base/pack/upper_buttons_middle_hover.png b/textures/base/pack/gui/upper_buttons_middle_hover.png
similarity index 100%
rename from textures/base/pack/upper_buttons_middle_hover.png
rename to textures/base/pack/gui/upper_buttons_middle_hover.png
diff --git a/textures/base/pack/upper_buttons_middle_selected.png b/textures/base/pack/gui/upper_buttons_middle_selected.png
similarity index 100%
rename from textures/base/pack/upper_buttons_middle_selected.png
rename to textures/base/pack/gui/upper_buttons_middle_selected.png
diff --git a/textures/base/pack/upper_buttons_right.png b/textures/base/pack/gui/upper_buttons_right.png
similarity index 100%
rename from textures/base/pack/upper_buttons_right.png
rename to textures/base/pack/gui/upper_buttons_right.png
diff --git a/textures/base/pack/upper_buttons_right_hover.png b/textures/base/pack/gui/upper_buttons_right_hover.png
similarity index 100%
rename from textures/base/pack/upper_buttons_right_hover.png
rename to textures/base/pack/gui/upper_buttons_right_hover.png
diff --git a/textures/base/pack/upper_buttons_right_selected.png b/textures/base/pack/gui/upper_buttons_right_selected.png
similarity index 100%
rename from textures/base/pack/upper_buttons_right_selected.png
rename to textures/base/pack/gui/upper_buttons_right_selected.png
diff --git a/textures/base/pack/select_btn.png b/textures/base/pack/select_btn.png
deleted file mode 100644
index eb7a8e9980b177826a04018391e9d9d5cbe3e798..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 525
zcmV+o0`mQdP)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_0000RP)t-s0000d
zGgl`vRwy%9Co@)7WS3TCm{(<(S7exK>hOU80004WQchC<K<3zH0004?Nkl<Zcmajf
z(T(FU3<S_=!Hydcr3T_n1ESeN;%gwH8!+hxF4?m0vcZ0adWQc70x<-Lmob+#lF(Ep
z9;nDrM`jYiubK+gapEsZT!vKhB~eO=@y5%|Y;$u}Z}xO`SJnOQ#{3SP^=?mXhh8^3
z%=G&w*sReE0AvR~&|3m9sp5lsBLHc`M_vIW4+1kFhJYuCBXAc?VW1V%CjwrOH4Ie9
zj(`%1h5-RRJ41f$2wVko7+49#!lDS1hJlRbihv6!E{d?+5YP;1opq0EXBV_}cEJY%
ze!&#KP(ZD-3$b{H-jED-1R6uuPEpxARgX^u?1aHOLsA&9(wSkG&I?|^4T0N?>InFP
zIc{?7RQ({NhJYo^y&leM7^t9c1e`iWX~7boK}NkHU<5i4_$!!K1e9>H&IwA2fc0*a
zGv;^~BS1l7F91qVL?ZyRDL!y50CH>ipfv^nlC~cYcinciP2JqhR{u{DUdp)sc{Ep7
zwb$pin)+3(T^MgvbK;9kg+`jP)FCg#Lmu&qMb6CA>(5h3RVoP+p8((=gLi}Q=nkF1
P00000NkvXXu0mjfQ=`>^