From f20ffe3d1938cb1b84b0393d9a1ec7dc011fab38 Mon Sep 17 00:00:00 2001 From: MoNTE48 Date: Fri, 20 Jul 2018 14:32:08 +0200 Subject: [PATCH] Minor upd menu, tmp fix sign_wall --- builtin/fstk/tabview.lua | 2 +- builtin/mainmenu/tab_local.lua | 16 ++++++++-------- builtin/mainmenu/tab_online.lua | 11 +++++++++-- textures/base/bg_common.png | Bin 0 -> 715 bytes textures/base/bg_local.png | Bin 0 -> 3102 bytes textures/base/local_creative_false_btn.png | Bin 0 -> 95 bytes textures/base/local_creative_true_btn.png | Bin 0 -> 177 bytes textures/base/multicraft_common_bg.png | Bin 702 -> 0 bytes textures/base/multicraft_local_bg.png | Bin 1001 -> 0 bytes .../multicraft_local_creative_false_btn.png | Bin 332 -> 0 bytes .../base/multicraft_local_creative_true_btn.png | Bin 389 -> 0 bytes textures/base/multicraft_local_delete_btn.png | Bin 532 -> 0 bytes textures/base/multicraft_local_new_btn.png | Bin 393 -> 0 bytes textures/base/multicraft_local_play_btn.png | Bin 463 -> 0 bytes textures/base/refresh.png | Bin 0 -> 614 bytes 15 files changed, 18 insertions(+), 11 deletions(-) create mode 100644 textures/base/bg_common.png create mode 100644 textures/base/bg_local.png create mode 100644 textures/base/local_creative_false_btn.png create mode 100644 textures/base/local_creative_true_btn.png delete mode 100644 textures/base/multicraft_common_bg.png delete mode 100644 textures/base/multicraft_local_bg.png delete mode 100644 textures/base/multicraft_local_creative_false_btn.png delete mode 100644 textures/base/multicraft_local_creative_true_btn.png delete mode 100644 textures/base/multicraft_local_delete_btn.png delete mode 100644 textures/base/multicraft_local_new_btn.png delete mode 100644 textures/base/multicraft_local_play_btn.png create mode 100644 textures/base/refresh.png diff --git a/builtin/fstk/tabview.lua b/builtin/fstk/tabview.lua index 1ad1e199..63f985ae 100644 --- a/builtin/fstk/tabview.lua +++ b/builtin/fstk/tabview.lua @@ -60,7 +60,7 @@ local function get_bg(tsize, tabname) tabname = tabname or "common" return "background[0,0;" .. tsize.width .. "," .. tsize.height .. ";" .. core.formspec_escape(defaulttexturedir .. - "multicraft_" .. tabname .. "_bg.png") .. ";true]" + "bg_" .. tabname .. ".png") .. ";true]" end -------------------------------------------------------------------------------- diff --git a/builtin/mainmenu/tab_local.lua b/builtin/mainmenu/tab_local.lua index ee7fc653..34663317 100644 --- a/builtin/mainmenu/tab_local.lua +++ b/builtin/mainmenu/tab_local.lua @@ -31,22 +31,22 @@ local function get_formspec(tabview, name, tabdata) ) retval = retval .. - "image_button[0,4.8;3.375,0.9;" .. + "image_button[0,4.84;3.31,0.92;" .. core.formspec_escape(defaulttexturedir .. - "multicraft_local_delete_btn.png") .. ";world_delete;;true;false]" .. - "image_button[3.12,4.8;3.375,0.9;" .. + "blank.png") .. ";world_delete;;true;false]" .. + "image_button[3.14,4.84;3.3,0.92;" .. core.formspec_escape(defaulttexturedir .. - "multicraft_local_new_btn.png") .. ";world_create;;true;false]" + "blank.png") .. ";world_create;;true;false]" local creative_mode = core.settings:get_bool("creative_mode") retval = retval .. - "image_button[6.8,1.5;5,1.3;" .. + "image_button[6.72,1.43;4.96,1.41;" .. core.formspec_escape(defaulttexturedir .. - "multicraft_local_play_btn.png") .. ";play;;true;false]" .. - "image_button[7.5,3.15;3.8,0.95;" .. + "blank.png") .. ";play;;true;false]" .. + "image_button[7.33,3.09;3.73,0.86;" .. core.formspec_escape(defaulttexturedir .. - "multicraft_local_creative_" .. + "local_creative_" .. tostring(creative_mode) .. "_btn.png") .. ";cb_creative_mode;;true;false]" .. "textlist[0,0;6.24,4.6;sp_worlds;" .. diff --git a/builtin/mainmenu/tab_online.lua b/builtin/mainmenu/tab_online.lua index 8448daad..fd919a2f 100644 --- a/builtin/mainmenu/tab_online.lua +++ b/builtin/mainmenu/tab_online.lua @@ -33,8 +33,10 @@ local function get_formspec(tabview, name, tabdata) local retval = -- Search - "field[0.15,0.5;6.05,0.27;te_search;;"..core.formspec_escape(tabdata.search_for).."]".. - "button[5.8,0.25;2,0.1;btn_mp_search;" .. fgettext("Search") .. "]" .. + "field[0.15,0.075;5.91,1;te_search;;" .. core.formspec_escape(tabdata.search_for) .. "]" .. + "button[5.62,-0.25;1.5,1;btn_mp_search;" .. fgettext("Search") .. "]" .. + "image_button[6.97,-.165;.83,.83;" .. core.formspec_escape(defaulttexturedir .. "refresh.png") + .. ";btn_mp_refresh;" .. fgettext("") .. "]" .. -- Address / Port "label[7.75,-0.25;" .. fgettext("Address / Port") .. "]" .. @@ -299,6 +301,11 @@ local function main_button_handler(tabview, fields, name, tabdata) return true end + if fields.btn_mp_refresh then + asyncOnlineFavourites() + return true + end + if (fields.btn_mp_connect or fields.key_enter) and fields.te_address ~= "" and fields.te_port then gamedata.playername = fields.te_name diff --git a/textures/base/bg_common.png b/textures/base/bg_common.png new file mode 100644 index 0000000000000000000000000000000000000000..046effa6d684a4e0bec9d212c00f95b7f6e1386e GIT binary patch literal 715 zcmeAS@N?(olHy`uVBq!ia0y~yV6k9eV7$k~3>0CG4psqDoB=)|u0Xn|sOajIr~)y==(EY{a!n-8bg=d#Wzp$Pz1cK4nD literal 0 HcmV?d00001 diff --git a/textures/base/bg_local.png b/textures/base/bg_local.png new file mode 100644 index 0000000000000000000000000000000000000000..8d8a6eeffdaebcb9ff5d7f5dc27ae41823f5aa97 GIT binary patch literal 3102 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 literal 0 HcmV?d00001 diff --git a/textures/base/local_creative_false_btn.png b/textures/base/local_creative_false_btn.png new file mode 100644 index 0000000000000000000000000000000000000000..5ac15e66ad227e49a1de97726ca4a2cd45d3c377 GIT binary patch literal 95 zcmeAS@N?(olHy`uVBq!ia0vp^j3CU&3?x-=hn)ga%mF?juK)l4Uw%aT1W2wV$S;_| n;n|HeAcxD-#WAEJE;#|nW@2ExH?My`kj3EX>gTe~DWM4f>^B$J literal 0 HcmV?d00001 diff --git a/textures/base/local_creative_true_btn.png b/textures/base/local_creative_true_btn.png new file mode 100644 index 0000000000000000000000000000000000000000..198fe53b59102a67064ef361e56aa0429089167e GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0y~yU^D@;Et!~sa!U%hbQLd=>}J_Zx_xwDo>blWVQwdhLLyg1*Jj16TGaVE9vHf8~p%#!aB Y-0CG4psqDoB=)|u0Xn|sOaX+o2wXF zv>6zf3OrpLLn;{GUT9=>HWXmE;P8!G=1v{^+)a}-cJS*4+>?IDTgQCHBEl-__!)6` zUD>sZ4;>L(xwtfCY1i6KRqcGj*PYw>_~oriUR+oRWXYm18qxSr6$>yFf+et-0F+=u zH51boVnnFn5_S~7!EF7(k5w2WG)VF^cB?Mn@CA;5!yfoA9MEG4;u8!9LrldQuM3&6 z$B71i_^XN+9>UQtU&wBDIx4oaWJ{k(;ncoshG_+B7A`JjsCmm<_GLe}&6T?kfeDep M)78&qol`;+01|~IUjP6A diff --git a/textures/base/multicraft_local_bg.png b/textures/base/multicraft_local_bg.png deleted file mode 100644 index af16d09b13a6a63f41805978c7196460f1e0c4cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1001 zcmeAS@N?(olHy`uVBq!ia0y~yV6k9eV7$k|3>4{+Ue*GngaUj*T!C~^QPIttH~;_t z@9yqCckW!%eew?(7?>w{x;TbZFuuKV(D$%|i0ei1)4YGgF4g;X@YQK?G%TI*vFRh1 zK!G1`xcPksh6j_%MI}n_>HK6_bK6`?_{-MM@4uY1Ea(e4Zd3MUT1&CPMwL**KE`N) zr!qb|)!O_4)iMUw?yPL4mh6A_SqQK{a**j@E>z%)Fy8U3;rHg^12-+#O=W(!eRgpJ zlI)R2AP1}t%z|jbQ1FNWXb_SD1wMrN5Mc}jM;Kuafayas;Rxe#3#b!eDms`EEQo~| z3JNjYHb9O?_Z<;#NB0~N0gvuEA_5*gW*lTN0v_G%=n4+TE0Y-85uYEfEIM%dtfj?c znU@X4Xa-WjNsUCNl@F?gC2SYY9lT>SjVYP$oZ(}cyVnepxEIZB?kv?_%C!5|vxhQ1 kF>)(;4p=fU{HR=?V6Cv?z+>-Ez&y*~>FVdQ&MBb@0J73c1^@s6 diff --git a/textures/base/multicraft_local_creative_false_btn.png b/textures/base/multicraft_local_creative_false_btn.png deleted file mode 100644 index e9fbb982faffc7a85dcc7664e302aac2fe8bfd34..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 332 zcmV-S0ki&zP)t<80d!JMQvg8b*k%9#0Od(UK~#7FVqg>;I3U0v z1Zd9=P!H-4Z{|F8Ial;|j5MtTgc|g;K&mR<2t}2(m&h^lT zTgupvjy)|YGkz!fFfI3I%43H&)=Vl#?n_of*4!qr_q*>&1(oCX@E_znFxe18#dk42B+;6dkDNdu4AJfY& zI!(tFo^jx!Uq{E@yh{_^d~ef(!^EYZ|MLa;aCB`;ik^KRK0RHJ8&~LhzAn1nr4e24 j&516$=zmF1{8xY{Ilt>`r9b8k00000NkvXXu0mjfT}!Vs diff --git a/textures/base/multicraft_local_delete_btn.png b/textures/base/multicraft_local_delete_btn.png deleted file mode 100644 index 013530f1bb8ad7aeb5082255d6aeb0930a517f3d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 532 zcmV+v0_**WP)l63Y_Nt+dBG)x1MTBaSVSUZbbuu*VL~V%WHf|9 zC?I6Cf$4d*0s_~lF`hMrLFla@!!>F>!ULw&y7Y!@cD26LY72{w?6<3jF|5q8*;O`S z_aB`UHe?MMt~Ok@FqQ3a0psFyFl0$fSHoosLzc8;;o1+oQ!a|$eu{KC217=;oMFh+ zB+e$wKA|!zEdNDynO`^o8+dGh1q%ZcJggMlZ<{QA$MKjF6eZaAkv4>!9TwGDDcU zM79Yd7TP&&!{`7^U1JfMDJ*8!Ec5;`XT|jj*&4+M1`ou#uDE3MgMomcqYq5aEJjIS zjM3>`r91>S$#5~^Ix|fE(VP*uWORgqfFPp@EJ=#k7|+}_Uxxtpely1n_I~@#4fY92 W#V2&wY2La30000Z&_PilD^{;DhuCEQ|NlC8AIJ2wV;{q600001bW%=J06^y0W&i*I z6G=otRCwC$+T9LQMFhIM{H({Aa&IV!3E?_8NwqU3e#sORCiu5L6 z0Sg!~O*wPU?b0^bwW;2uw>!bI9~cqk<%p;ohW-Y|+K#YkqDL|+O_N=i&?1eHbi%Y( zFpRImLYgnAju?LIOZ`NQpl0d+NAsM}x00000NkvXXu0mjftf!;( diff --git a/textures/base/multicraft_local_play_btn.png b/textures/base/multicraft_local_play_btn.png deleted file mode 100644 index b55a4b910bd1e99c6eaaaddfdbf78340e3aea48a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 463 zcmV;=0WkiFP)0d!JMQvg8b*k%9#0bEH$ zK~#7F?cBj_#2^%e;k58ta0@6M&_P5CwBQzK!7Xf+@f`L!v6K}n5ys$|(;oKle+P4e z56lJ~+GhZmErZT%3c#Kp2Hj4W0}z%G4Tzorfc}8~5d{H)IRIhEO$2zk1-qu;E&#ef zfEdXF0oVco_yPg=0s-m;pXrzY4FM2P0Rlj9AHdh~gAd3j0SzDk1UCfyNlDLD${PS6 zpaKNQ5HJA(K+pnk{#P|X00;!=3`j1>`w|4N0ls$uzRLgtRtq>EOzi+E`_euEdIQ$q zE7Jo`weN7EpS^z;0Dtv>%@q3h(|bvUgH2yCj2DP7gWw0agnGS3ADaL1I`m)=)er~hLX5P& zAdd{hLMgNXmLWn~Z_om<)Q>o{0nQ+;_h^DxIv?U4ki{s>rqBklR0#DF+=;XXAP#Q8 zr4e5SxD2x@njsDrVK2I|FVU6g{LB7Ct1kmQh1qjRqxmwxCzxGdNCW(a+35xhP{5d> z;==%CM236=1~><^pFRxmzubaZw2%gP3A4w(46qr!i5z+oxx|4)FFLUp;$S^un3a4P zAc9L*Ar9^!tsTA$Fb0-G|Vc8oBE-@fRFGCbB%}eVI0~`Uf)S)u#*)wm zxB#(`MFEpYE5>d}Xah`R5Zzb-F>JsoyhXh(LP8tBR7HeW7{)i)bQj|701Z|`CX@jt zaUU_}+cnwkYcOj1=PT(N6VkyLhYf34llu}A5rIgbC0QMs0%SFaMTL1t607*qoM6N<$f^@?F AF#rGn literal 0 HcmV?d00001