From 2f8803097697b5c2de8044bbfe8bf805cd5a6775 Mon Sep 17 00:00:00 2001 From: MoNTE48 Date: Sun, 25 Oct 2020 18:48:29 +0100 Subject: [PATCH] MainMenu: cleanup --- .gitignore | 2 ++ builtin/fstk/tabview.lua | 2 +- builtin/mainmenu/tab_local.lua | 11 +++++++---- textures/base/bg_hosting.png | Bin 1503 -> 0 bytes textures/base/bg_local.png | Bin 5099 -> 4805 bytes ...osting_creative_bg.png => creative_bg.png} | Bin ...ive_checkbox.png => creative_checkbox.png} | Bin textures/base/server_off.png | Bin 412 -> 0 bytes textures/base/server_on.png | Bin 412 -> 0 bytes 9 files changed, 10 insertions(+), 5 deletions(-) delete mode 100644 textures/base/bg_hosting.png rename textures/base/{hosting_creative_bg.png => creative_bg.png} (100%) rename textures/base/{local_creative_checkbox.png => creative_checkbox.png} (100%) delete mode 100644 textures/base/server_off.png delete mode 100644 textures/base/server_on.png diff --git a/.gitignore b/.gitignore index 87a6c2cb..bb2567da 100644 --- a/.gitignore +++ b/.gitignore @@ -49,6 +49,8 @@ desktop.ini /clientmods/* !/clientmods/preview/ /client/mod_storage/ +/textures/base/hosting/ +/builtin/mainmenu/hosting/ ## Configuration/log files debug.txt diff --git a/builtin/fstk/tabview.lua b/builtin/fstk/tabview.lua index eda52976..45d37b1f 100644 --- a/builtin/fstk/tabview.lua +++ b/builtin/fstk/tabview.lua @@ -78,7 +78,7 @@ local function get_formspec(self) if not self.hidden and (self.parent == nil or not self.parent.hidden) then local name = self.tablist[self.last_tab_index].name - local tabname = (name == "local" or name == "online" or name == "hosting") and name + local tabname = (name == "local" or name == "online") and name if self.parent == nil then local tsize = self.tablist[self.last_tab_index].tabsize or diff --git a/builtin/mainmenu/tab_local.lua b/builtin/mainmenu/tab_local.lua index c0394f07..b615eb83 100644 --- a/builtin/mainmenu/tab_local.lua +++ b/builtin/mainmenu/tab_local.lua @@ -19,7 +19,7 @@ local function get_formspec() local index = filterlist.get_current_index(menudata.worldlist, tonumber(core.settings:get("mainmenu_last_selected_world"))) local creative_checkbox = core.settings:get_bool("creative_mode") and - "local_creative_checkbox" or "blank" + "creative_checkbox" or "blank" local retval = "image_button[0,4.84;3.31,0.92;" .. @@ -37,9 +37,12 @@ local function get_formspec() "tooltip[play;".. fgettext("Play Game") .. "]" .. "image_button[7.33,3.09;3.73,0.86;" .. - core.formspec_escape(defaulttexturedir .. - creative_checkbox) .. - ".png;cb_creative_mode;;true;false]" .. + core.formspec_escape(defaulttexturedir) .. "creative_bg.png" .. + ";;;true;false]" .. + + "image_button[7.33,3.09;3.73,0.86;" .. + core.formspec_escape(defaulttexturedir) .. creative_checkbox .. + ".png;cb_creative_mode;;true;false]" .. "tooltip[cb_creative_mode;".. fgettext("Creative mode") .. "]" .. "tableoptions[background=#27233F;border=false]" .. diff --git a/textures/base/bg_hosting.png b/textures/base/bg_hosting.png deleted file mode 100644 index 2f9c3b4b9942b3df29829f67dcf11528d23680ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1503 zcmeAS@N?(olHy`uVBq!ia0y~y;3!~VVBW*T3=|3Lw>%G|I0Jk_T!FM#Sj~|;pMskX zSphkWB|(0{3=Yq3q%knCws^WYhEy=Vy<{lJpuoehQSZn0hLCCE2V;eKCBqnjsxiPh z*$K>+$jE{32{K}^Y?3+Ah=dr66xfjwie#eS+d4M1h+`(NWWC1Q?2u<(WyTV-bD7TRo^$`WpWpZK`F*~h`<>Ts(M`ca{;9eK zsh4cjzqjl82mpX?x;k9~cJFwB0DPnNwD69+{Ro6%+Nmb+9q3}5a{`bnDe4#H{woT6 z@4Su_80!Egq6C-|0KDXDDdf|=XmT@TO%(uMK|nzTG~!f1R7hhJ@<>^XghNV*ogx`A z+hhDpRrUgesLGl{X2_TV5qSeWMwrT9A*wRQIJX--Y#XI9N3F350*8q^rCbix)XM-3 zgfD|d4(}zyhNis1I@!_Zmq5VBYEW|K`LB< zX>q!BY^1x%kdF~2kCI8j+3^9I3GW1rxj0kfBbT>7@O$51)9IO9E)fxe+u_qdNggm| z<-tTF1YA5CruXYaSPKcvfBZ6osEt}*9y;GTYLi^xDHo%I<}BZy8%emTf;crD5l1Pb zNOPik-Yw@~~42l})&_%3zpY!H}x2;1p z$m|lj5}KbM-Z4nfARW(0J~K}IY4Qmb>;@Bh33CtA0t5ykmQ$_}qm4!apyYrQwsqm} zM;ltQk23`3L8TA>>@bn0z{B)8HCj7rUP_9Sj_sF6ifpIO}O2FDnns2!hI)H)D5ug#rx6ueHazZk&~ z%(oxd_Cb<;#Y1~`%Tk6osWxk@qk|3oEZVp($9&JaqVx0PYZ4(NMbw}I(}(D}v2h(y}l^?E4uO-A&& z^heEg+vL*yciz*x|dBh0^e)3kzRdH!;c%R`eE%S5ZGj6l7w*QA2zBA6ffb$cnpPFhb1tGS-+<1cA%Cs0-**;=I)&_=rP# z-mI^lB^&Cmspu?qmrmtfeRnQ=FHRU#IE~+2JUP%ezZ9&q>mP2Xkj0;!A#LI>BeCs+ zhL;zp*s89G`6eT&8HWic7I3DO<9=i1X}@T5CvqN}S@d>TxLY;no<2CN99m&hbaS`? z=d`wCosGCnjtTh#n*;6pZ%jOg-E~e@JKY0rsi#&Sw_;BlS@>Dd0uxK3-Vpd1*UvIe z^an0Ppv~+Un_Vu!J=l%2CDaAiAluq-|75|pQei3?{k~mKDnGIU1i_nRt?AD=a;C#=ZL8r2#m(^=6FiEKqG4ovrynZ5^S|>y DtEIuK delta 2220 zcmYjSX;4#H7QP`YvY44x6oIFz} z9TQAMwyC+Ml^vrB%bi_22R6*2mrR)RNlX;|{p> zPMRMV%Pj&c!_0%+4Sc&EN#6d5y;qf3dAOeLNg&{o=iC`p+Wc)8koKz@*n|V%AOuEi zf5NPPP3_x?ESoW?mA(Zyax~qU1G@QY-?f=VdcMpV9UZ2j`VTNYXA}^B6^q1Owp9{BExJ+;*!00MxYr{R;pSap00B zKPq%OY&rn)e0LoSnyzD;GLk#Q)t(C#)KnM&NFsunaIf9c zV&A2UHfE555Xx&O4jkj}a;`7p-YyIrp_Jt#TdrckpCQGT)ZE^T^+T@^s!m>N%LmIO z(S`fvqLnq=Mimcggzhb^bNrn0mhYEGhLg>s`60f=G7tXrnAFei<8?{;#*~lOxZfPR z^w@sfRf=S(?Cs0)D)AF-rNRgxrxq)~aK*VUx_ShZ7bi#c8fvJ}B9KtDc~_t{uGYr- zWq_0!HW|zdr>+yN223{gE6zQ^KN*K|Qpu3(uGM5s*JeJz?o;cBn6qkzRd+V+#W3&a z>M|eex&Cj66zgwlKkO_ydn5CZq2_A47JUQ8>TGs{8ZcvGut9LH`;1X!nn{YTtr+{> z9_bH?6PXrs!v%2vk_{Jr>w=0Doyr(H%j;RhHabrxA4N=&#NPy{#di=XVutAV^HIE9soL8;0yW9(^KcG@bJ(e zlc_P0@M05cEs1Lv5spv?xIKWF29U*swoBNi-BBO zgWfc(5UC8n=g(`kJnMRj6PwUh$7y*#oXE0{+xIJnloI3d)7BA_eji)_;^>Q^LmK4s1Z{>_qV%2c?Gdc zZ7Y3-Qx;Ksn+hs%=Wb zQD*ImF@L6FN5bitn}4OUb6cq|+CRlk-18K;3trFqM_}}kdl>eNrc_WMJI*=st!N2- z`mTWt-!|tRXdkl;AbzKT{09_$@~y^xVoiCSuR-*ped}MGYaNSi#vK@BygFJmlJbm_ zOM@18n1$%d$DY9I8U=$QIkGO#r3^73a@yAkVj0!y>D!kM=gJl0>G0cWl4tv+$9v$T zT-O(zD<6tYk5%YUN+S#ie-QQ9A^hN3PgZCp9U4-Z?iRpzGOkJ%c zYQJh=ho5&yyKRKo4c6x&TEX?GDXenD6aLQ1yeK^*&UesOP21)y$$a1Gb15WWc7L%M zXJPa5{VE?N4mfOzSLrcED|N^Jk`*RPZ@|b*GF3YK);e|jvUtY<#wZQD$l)JWAz$Pj zm+~~sbp40)lqW}OGKpLRL$8=kb*+uMs7RrIa+!@Ea204O15$(AmSaM*du^Lz1}G>m zpo;@d$TRUY1D05{ynfTLSw^I%eNAD1wMIFFHe2si_~UltWCy;9?R#!=!(Vb^f|X7T z@J9~7VqESODzuPJrOk{??}AVlYTk}WzSXvxp3#&-d1n?n&2v;o0in+!@~gfkx$s&T mx}t0Syx#L#;El=dbllDbZUVaxYx={AIM>4-|EM?=diB4n9IBT9 diff --git a/textures/base/hosting_creative_bg.png b/textures/base/creative_bg.png similarity index 100% rename from textures/base/hosting_creative_bg.png rename to textures/base/creative_bg.png diff --git a/textures/base/local_creative_checkbox.png b/textures/base/creative_checkbox.png similarity index 100% rename from textures/base/local_creative_checkbox.png rename to textures/base/creative_checkbox.png diff --git a/textures/base/server_off.png b/textures/base/server_off.png deleted file mode 100644 index 217755f7ad92777a7d5d87821dcad8451333b092..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 412 zcmV;N0b~A&P)a!L8~50004WQchC