From 0cc5945331930b23bcc2286871b73649303420f7 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 15 Aug 2020 10:12:34 -0400 Subject: [PATCH] Better mod dialog layout / Less obnoxious button sound --- .../android/AndroidRhinoContext.java | 10 +---- .../sprites/blocks/props/white-tree-dead.png | Bin 9858 -> 9855 bytes .../sprites/blocks/props/white-tree.png | Bin 7579 -> 7561 bytes core/assets/sounds/press.ogg | Bin 4735 -> 5138 bytes core/src/mindustry/core/NetServer.java | 2 +- core/src/mindustry/entities/GroupDefs.java | 2 +- core/src/mindustry/ui/dialogs/ModsDialog.java | 38 +++++++----------- .../world/blocks/environment/TreeBlock.java | 2 +- 8 files changed, 18 insertions(+), 36 deletions(-) diff --git a/android/src/mindustry/android/AndroidRhinoContext.java b/android/src/mindustry/android/AndroidRhinoContext.java index 513911820d..c4468ecead 100644 --- a/android/src/mindustry/android/AndroidRhinoContext.java +++ b/android/src/mindustry/android/AndroidRhinoContext.java @@ -121,7 +121,7 @@ public class AndroidRhinoContext{ } return loadClass(dex, name); }catch(IOException | ClassNotFoundException e){ - throw new FatalLoadingException(e); + throw new RuntimeException("Failed to define class", e); } } @@ -151,14 +151,6 @@ public class AndroidRhinoContext{ } } - - /** Might be thrown in any Rhino method that loads bytecode if the loading failed. */ - public static class FatalLoadingException extends RuntimeException{ - FatalLoadingException(Throwable t){ - super("Failed to define class", t); - } - } - static class FileAndroidClassLoader extends BaseAndroidClassLoader{ private static int instanceCounter = 0; private final File dexFile; diff --git a/core/assets-raw/sprites/blocks/props/white-tree-dead.png b/core/assets-raw/sprites/blocks/props/white-tree-dead.png index 018c4edd20efb4f7ca6cb69a1e95f03475df7419..cfb6d65cf1f7ce1a9678a64499c3ec0ea2f865f5 100644 GIT binary patch delta 9394 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 delta 9406 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 Eg603^^#A|> diff --git a/core/assets-raw/sprites/blocks/props/white-tree.png b/core/assets-raw/sprites/blocks/props/white-tree.png index e8396ad684da602e9ddc4a2063518e2f1e80ac72..91f17de31696eabdfa783975e53a206f65e394f0 100644 GIT binary patch delta 7132 zcmV<28zbbKJBd56v;jrHNklO>)&Z7eM{GzU@!}77~U~JqVkCRlp{aK^F{@ zg+NlhpY}HZgJL9EKle&k@;Oyhbtf;+vMnE9{aq~!lVKele^}(wy8r;z`0)1Iy8qed zudjJlCWM;`;NX+r1`?c)zj_w{U=(6s!7u*)@eY3f=4IEqczgf&M;UvU3G|@}3|-j7 zX91u5;2hYgg)lAqQC^??EK0~?nLrjod}vNgEIpc?f7Z$a?H~e#=ES5z)CDa;fY60e zBxtEDAP)kBZXiME4FZI&Sdbw7eCGuLLU$}k@CYmA09g>&ZmzG03@3$~3TElGL~WlHdRfQ}Ju5_j zFeEgIe?bBS2xd8o@-!sqi~e9<5FnVwO5Yn1=bRuwFi-E5BBaKj7X%0p0r|}h0t86F zN>dzUL4W`Oi2mjW0RjYIU*P#cfG{+YP1Dd67@EKHf&c;Fv>-q*$%nV!)@?)eo^$Ys z{^o|83+C9wx5u}iu#}*D&EJpjzW@5~{ockfe+NW>Fbx0x^PkH19?5T6!cvB@L4Ytc z8qMRq{9s=G*Si1!J#nKy#CJZ30AUz>eSlIN$&Wt3IYEFhJf+QGQeOcA1atVJE$QeF z`N6U<4F(3{DAG%v5|c9O>q7H)UWfo;7-};_-`+p2xy@zdH#gi|7z&ALFTNxPm&@hi zf6nzoeCL3h48u_?!My<4@$J0O1cp53r%0xLj`C= zXfZt!%%`Lea2EN6&YiSfWpL3NaFj^|38r&4`T6E7#`Y>fgn7^hs0?Y8`ZAjQ)*Zgj z#QHJWz&#K80AX5OQCJgS?NYp$1aE$Rf48-Bwg?fRGAYel)}^LV65U*WqEVh)jv_nF zD4UVuW$bJk(keR2K#^>_P-+kWeIed;hp5NZKro9%*;_0Vl!E|` zqumrv>EE;72iQ|evFMNHuYC~UfV6zzU;IrK*>JD>&Gi-Xn*eI}0Q8#Xf3eBWdb985 z`bs^g;$D6sSid_K-KN2?Lz*3Y`3gsj{95F?BkG%rE;lSRt-^ii&N%5ehA#?}zD7rp zUh8|38hL8(`;ij;A-^#(^_u_ppZ|In;nY}r>73SHfj@tJeQ`y| zL};5FE%~yHrRFo(qgHsl+#^+dtCXA9DTH;f3*b95?S$bnICg0 z@qNN;vBq0up(SX3B#Fni2>laSxWR&ONgi^O11e=8CC(#)~C>KJnqp+SfD zZ(d$pVxLQiuq{s#wjw{5l1-b|0Q=8{a%_@&^BD7Qh|t@dX0SdflB>NBlF^^U_byAi z{CqExBhjTsf~ms%`0o4RXNUyDn2!Ky`r4*PB&hZB%UOCE64_CNogy~vEk5Bl<^>qS zauaM8Qbp79e_m+HFO`%iu2h0K@=J;SAkMG?gf{quv+}U6A0oltzCN@{^jsS1Q4y z<8Qxb9$*>63D5_bI`nz}=H=xk;Q_YtqOl}D_xo}rm~(t&SH=*7AUPF*EYj_)xRfEmJ*IK8_`wMhhPMlDnCn-Os(K7qnj6t(SAx=H(ttp z7-AGy3isg%HJ@NkdPRR0`%K|CBBQ{*o7}6yf2B5sH)1=d`95>>Sx6^mhr1N4MSm&s zqaO7|Z5qsoDZz6d#uRaa4SLkUBl%HhY*5_<{`BQl^!FB+4Hsfa6Gdds>gY=FC?sU0b||h!B<~F29jlLucXehPV=RCqAbL zf5sI_Ybj_&Det-BNLxNqn;=0S zRBp~*f^K4hRuBDFhFG#lNdda#%FvPse^aEl$GwiNo54M!Kcc?zQM*Y!D@Tg_mPJp1 z%Oc-A-b+GKn)`dTmHp=WDrw`LSQNM{dJ^mz{UN_OnDPxNu~&k`Ac~dsojw7j_S^pZ z&wokB@V!iOn!_UrFm&w@-*~9z1B^{aaeppZaim6nB~m|G*)JniF21t9`1`M9e+lmC znTky7x+A~2P+tq2QZd{u0!xpxZ7o>(_dX;lwWSHVE=PjcChXQqYrp=w=DT`>{N|%c zM(CVqDi#?^3NAI7>sE%EW7kB2A%RLqII#h$*rfOrW=Kkl{N|)tHkgu%vhI*7OGzf{ z+I<>wBf+DkdJ@a|?jD|go!60+e~zwMj*$0}pjKq49dRPR@iDhZToT_vNNpN_sq*`T zQQKV3kx*$A=8FVh{Qdhq8aoHcsP*VtNv=ZjjgpTT#loMM$dD^dujvmKNRf=j!<)Jv zuapFH1Q`08)OzBZ+>Zd~pzBSnl}V2#NbVjKy@-iM>)~xFLCI?#t4BnCe{(ZjM(EUy zkTeMODQz3uSeWv%(L>6qVz9P%b7~*6rTYsqbQNHZ#Cl0@S@P27TasZ&G@640BS%NB z1f>Vwz$V=zz?j&2MtjRrzi)_?2roNw|Gu>ZmnAJ)vJ?ew9Eopa!NZ?)7vRSJA@4oK zKvEDT5{zAklIzn$f?DK?e^a7PS%~OC9^PgiMrtCKG}E-xl%)=a_{x$(iU3n&SJLly zh6r#!)v0#sm}Q!*1Q~@R@o6mRuO(-d%|>WvJc)-}`x;2eZ~I)%wL7Ey+@H-T!s$+^ zl-PrtTk%8RrS$;Sbk_SKuzfkTGB)Q#e=+feGXJDLu(9jcb6ba&e@J9d8j-0^rW6ff zwcJa%cC@lZ|CTGT)Z-mRdy)@qYI?AlB)C84GYatZP2kZtJ(rlO;b!dCLP~lYDG%$i z{Aj+VJhY+au$7c%(lEv62d5X{`!_Ey8e3ZKzgGk4N-QxgMLO$EOU@#}(t0yn^tUXA zror@NlinzipXEuqf6|-Iw=k5BGWUooZy3n;a z_fa&-Cj{&Dq*BB$b75aF`O&vh;r7B?d|MGOX#m?|nU_NR9Gb3HqYU z5`4?*tPQA`e=5vO90{xDz#*=xW_ z60N4QM!%mAD*|L1j3A*(xvy02|NEND?n68J6c7#W9-fk~i|=zc&V4$Pu0{F9@Rir1 z;8T-SXv11y0b*+`k1E$u)6C*rt<)uGnn><19NN2OH2H^>i2DoG&e5wWzb6Kt^`9(Vk@E~0xYCuvjRDWu^1t@#QORBM5j5B zmWv4skA~K0VXEk~qmy0(A(CrmYmaL^0$kU14P7s*W#2zH7P=T{0vF&L$(6X7sZC+& zh|t0VQya-hC0H1Nqt=JyCRek=1u8^pxsZ=ue@$NZfoUBDYB%L_x97AfkFDO7EOE1d zwJ4AXu#nz2PJ^SZ0aE99<uA8FSK9mBm!0)Kzg*UJU3)%D(>=s9U}@096`?!R zUn=@*{XpleC)SLfTHRyo5#UBlf|?t(o4PooaC`r_&hT)QQroxIN_yKp@?FnV5lY`@ ze^&r4uEQt-ba7>t2ySL+O$+9$B^FNB6onK*Vdk+t@`j$I{>1wet4LR zC&5Tf%oq}tUgBD4Mu4I3*4W@DHG_B0eT`=qV6VA=roylCJ1h_2cnwM!oCVMOndhD61 z30zWPB`c0(^T|Smj+Mce6VV#lYqm>CDN}AevUaZ4>&Awe3sy_0!t|&VS`(W!sJU(> zmAqyUq^3D(Vcuj(IdaQjL4p={p$lQAAT?N$-^M5vwQwM=D)>>zM&L-7BqA;-|g{t;ug$CWrtnMt>WY z%eE}_DZWxFeo55UYD6`69d&KrUC)6w&Af&wSd`zg3?2bm7mN?fWs}CrT(1zmfrHvQ zrM<^<>G$vdMk}qCi&g2le+(-?UnSVmwOeH-`PJmN+o#zVELJue`5r@(k{YR%kZehW zn>wL+qq2ypI0k(!pOS43HQ-?ZyMkC(?$f(UDM{D{AL z7a*4u`9T^jnn5YYaesfbb6aaHKhQnOcK7h~?4Mf}%hxKzP)%Uue`lYXh#*yPS~(U| zk7J46S$#&hMlptq070MF!=yFCU#f4+(gW!$i4AoLXONwbVFZ{%?*Wh*@Qqlu+SyE!-c3X+%qp;2hG+tZDlekb<@Ww@b?IH6 z8Y~Im>@v2*5CZhEe^uzc1g%K1W&e*wED2}BQkl+F7c4WZ09`(ReSO*f^)Ab3jQAjq zlx?Tywxw{4c>z*M^hmk37W?&efI^tS)cU8^gNPa0CA z$r4NAv@D}HxuI^MC$?ukE3g@DI9O`>}Obc){_RUah z6}rcOhGqhT+VAeMPsq*nRkYmOOQYr(kdFD4AR{C^@I_&{k(tzSeH`tC5KIcOa#)dfN;<0657gx+xxd@9Nw#&W z_>$vEik(PN2D1XRBDfLx^ySsB|CUHgeiX_1e((F)#UbUmtx~GDkf8Ob_NPEzMr++lOZO_9O?P~Hucy&R*0lTVw&QA`bY51OxOBeB7F zY7{8(V65x9`i_?q{b|cLbt86ZQM8B%Q_HNq@%q`|f)ygYDf|B6ZXL<(`yNXs8Cwvb zW;wJsJeMd363l~(Rmi>)j$H91Mk!kfJEg4Je`V1Sp=5@dk?Ue>O!ff+SSD34?(S(v zeRz^mWok@12(SR6zvuKGcyX~(mQbBQg0?__C#FPxcMng`{)Vnc$* z3}2aA>QB)h*@qf7@ui z`BzC|)sVzz*tm>6K_;ffJ{sDLxSLwd-Xg8oOVE0GwIBkVlvHtSiBGLHe^a8qi-%U_ zJ7TmH_9-d5_Rs_dljKHCCE1@fxxIh%rssEwZK{6s-4#U>$D%|^WH>4aa56@0GP)cI zDkaj}|GuZ-N7&#i#``xfFTQe)e^B-m=mVU9TIpG8I))gbj3HcEw3q~~!D!`8Wy+H} z6EkIW_C`hNc~)K@)gjMsMz>P%7up-`!kao#MJd8VGPuq#k0+(I1f- zXhR<$OwY%6-~ag8hqvF>S^Kph9V)-!Pv{sm6$}vf9KX{&C8o% znHK0nAK=LtA?=mrvcX&+z=4QGeufdDQyfzS&gz(#2G^I1x4P)bO2M1i0U0#rtG zaAOAfZR{mD)473N5TFug8`YJ-7YPytf+h%10mN4a(I2z|0Sc3|e=N-<_c*DN7;PYd zC=go0N)SOTt;rotd;mQ_fC5N}?{c|ZB+}h4%Xu=s0MtSgxRMkxl{9nrpHKb!8RX|X z2b#g40RmKprYL}25MTwN=r6P+EtMK+5-9# zDL@(sP?$|jrGpXle;ER_0|8D%C@KU1KL~ITe9c;f2T%tBEF{*?M)Mb73|I+bfFtqc z4r(A$fHV-GFg@ji_yF>t30y$SX(p-1nqdi?%gy!Gvp&w*&JS!rr7EE19u_eHZj-KO zltU~r1b`GofCAJmeLMQ@*w1H_A3!VU1FS$hbMdyW_v{&xe~JD;3o2G2zN7=v(b!R9 zgPZHCDdq6t?YBS9`}5b=)14>uhbFLLd_vs@2WFiF?UP^Z=KwVzKtZ%qQOzp7jU&k+ zL6C+%zye&+?WOcy;drx)51WF?$hf<}wfh(hvb= zlDabE!`pA`fA&wiOf!Mxpe0nc3{vIy@!j`7epdTnw~jh3;J!Q%BWS=NNFpin^NA12 zL3*GKO<*CAAHaAZzyvI8GBj&57oaBy@PMPfw~g3$(3AtP2?C6eGw{$ua++Ca0L}mc z%;fIjDcBrsDM7>sP!CPB2&EZcw5D&Y>$---$BGevX?&OlqkvW1 z42ZG-<^lmGVqJbjh5-4{1dd=`dH_%d5g-7Z76dpEG=l;1K!5;nS`gr55CsCHg8%{G zv>-qLI4uZpLTCm9q=5hd;ItsX!C-PWfE+wb6R>acB1w~B9V3$v0tFbb%KriKvg0J& Sq)vqZ0000OLEpY7eMuO{oA1eEF=t}dJr}NtAI@;gDw~* z3xTA1Kka|eEl?au*5gXLlFzA173A?*w&mli*Of7oQ5_wBppnby0sv^^)B7LW{(E1) zzvWq35N;}fgHL`IB)A@bj4lAcEX3ppbAkW?{sY0C4+IF10g_w`1PB191pxxUX+eMh za9R)`Kn6^OSqp9^biocDXctImkVAX9p$sBGXpSot?W3rO?p$!Qp*b_HuGqG1Gsc+D zAAbJ&p0+Z7f*jmfXwFg8r%5nYfR@YUqNZ#h4^3cbiuNWioSXlRE&zZQZtowryN9P= z|G&Au8dw_W0TCcT09S^vCiHJWb7IZlSAYKd4*vM=_0YO_d;j>NjHAm0?V$+_L$Ko0 zfKPsK4)oMQSeE@LuTOp&C8V)TAPXTrbSEa35zS72ZRLS}5CKAWVp1XMf}S8i7{V+P z)KnIb2LZw`kRXf(0m4u;NRWQM^MU|jI2t5)gqCuEEC>)(FggkweS8=L0t7XLBt%mf zT7dvT6{96I`uNZn1PD_=9~`s*0fIV4H--1yTwf6xE($jl)G}&`+CD3^F=U2b6(T^G z5}L$+AOQjdwH!rxEhOlR{$O1YAgD%5-y0F&*+sRq{d$t1PBlT`K=8C1V}(j zQygSLfB*rA{?-Qp0t8@R;PpX(Fg21*)6f(cn!oFU00H2%AV5&br}sZLyP^8XIe0{W zYs1Y2by)H3@$DxpB`9C>_w$FJzy7`7+Zfh=fCvz#;qSlxY4W*8@-rqZWtbZT2vgId zdAye&tjqsK7XV-+ZuE!v&Ib`7OoOivP>Lh@(FeFD2oR>Hv>8n5D?ost4qvn-9sMCc zFotO`FcC+QUh0&Xlu=(7n!oEp1PIemn<4u4{&CA~E+fCS;pW0rNKAY2B{{fUE*E!y zt{>t%2i#%s1;~zX=Y=LPoEqeJZV(`x3Ud5`3oAi7vR_Y1KT}_5`obP6Kqo?r z>5*VQC4GRa$S-v6r0pt$i`IdoOd?1yowLc$H)k=nR|z7_gFe81&ZQ`q4iWigM&3~VNt?isOLIl{Dl;$n#Qq#zZZmb|K|Iw^a85~7+ zEsxjpxHCZn*nzL#-(HTI!rQiOS{~Hdxw*bl75$8AmhRU#fBE)?dbWcL(UFh@zkGZ1 z>)%vPKdBPYGzhRSv&0-kU;W5Q>iXr|8|s(?5#V54`Q1G{{d#CLJ;<}5>6%G@Mtw)Z zvOiB5a3kyWbLa!?$i6?&{r`Sy1EYDrneAFgl~+^$<*IOT6%c!1G(|O|ND+#b>l7<% zY7@9ddMQyL^G<(51gL=6!#i8_b7qcSWFd_C9qqM__>kXoxEP8c5`4)l(VwP!M_$8p z7z9zo$9JzUM11q1?VcgMbhuD|3Sq(fZ?s2%DN|h-$j}QBph7~C;O+h6*5Y9&Swk5u z=J`Qi7z9yDuc#(v)R2S@FG-aj(VuP*pkjOy)Yjj0Mu_~@0Re(qG|FCMnV=j5sGQbK z;gtS8?R|hFr4)<)X#VO40ZvHI2maNcR1u4N-EXe1klzAOyC-1OG!H9(Kkd!Fo9nCQ zITiQv3&Hx`xfnJLh8@!M;LBGyW8~K(*Bw#cS`4{ip=lNFLwCkWzcGAKnDjL|iu8Kl zlhnww^}Zh|(I4`g6IHMIzyJDYbP-OCwwF$7dE8WDZcasjBUA~{g-Was&G+Q);pv$O zrOKM}IYfW+(p`Y8Dk!6WS9GQ=3Iu40stC|c4-Y!g90l%?F01YTv(e^0>V)}FB|y-D zrYKNTSrFcObQj>!bQgD&ZKh}g0On&z1eha12-ETf5nJiNiwRa?SQGf`_qP{UgiM6i z$J3LYX~~U|v*G^6-bQy&IYLluB(BR#MiIV=Tfq1(-vU=d!ZbgUo$0w!MN0}!({GY9d`Y( zPZ~GZSE~DIrABjWrm=)3_SYWUer`;H$S=+m0(8lLSui2bgXCfZq$o){hayxaT7&G)m|{T?a5P>MJEf=0~!iAI1k zEv7z-PHZGd6xfE=(_y6g_aw?v!ck@;x@yJ{i~v*Rr%95j6`W;s>!LB*Pf6>>OL+`a zi~>vHJ{+Ou6RgRo=ucyxDf~uc6xer@M^(6g)TXc{wsV^AcaDA+(#hH3E(LATUyA&w zM`LL=4Q9ra;5iRtia0?BBkJIh{HQZJsBQv(`SvFIbB)bRJ6T#PV$gVwEzsPY(-i&1 zu2X8pZRkTV0{r^@?Ikq8aU{Jxy+>Yi=Bt&iE#5;!2*$+aH&biqEF9htSAy=u=M=$z zxFYE-g;vo@i5yoDV($GmChfc>qGv7h{*d2%h}@LWjjzcSSIfRk`;2LvPCvOBN|9K$lz@Y7$|8iuCrl*Rgjqcx3cP)HgrPZqmrgks?21+6mAY z`R4In5|Yx~-z!`8o9nBjjdx;EpfT+vI5PS}ervGg8&YDg1c^ZuE$cgd0!r<-{rj(f zl8)hfndCHwXA)rO+9AIAXqpc&HXX(NzGTIb8vT_>{iJ2Tj8wV!%KGZhKawSXxMyT4 zvR2m}`K?9swZJJA!`&jV^f-2F!P39?AyKI{P0)2Y5`>+wTPv;o`s3vj-|x}bIY>sWN7qVn6_Rh1e8wmiUZNsHt~8^jKWHFDGA$n7)cts+ zB$y+>(BGui6W`>11h@u6Z(^-XMl?Zk_n;U>Of;Xe3v9^~O|=3%BLVo5Wtb(*r&!4O|rQb-YCitI}I{mu{p z?x#A{P94+CvL{x;k@zGQ^tX6`BqV5zOxgC=Kw5xO^0VYf@Qm_vSy6<`olq$;dF598 z&}X%JfNDDHQ$*M*V{?xDV&V&B{z-jcW7luwwhld!$e=VMOPx%ADJ_K6b1&iA(aIkE zTdu%Tk9QR9Nj|Wt>A_Z#;QpM?D8Mes5HvIUrson1r zpXg% z>Jg>&q(ufL&78goJQK0#BWFSX2x8618KcEm;@(<9Q;ABl*QBCd=&d;AN%ul>bouuF zar22ndd^!9q;es)9JQ3ZRyF;HIVrr3%DgW}u2@%u2yg&@R*bb9hv!yY_xDH2&^PKF zlf;Y>qRY`Jdnh{gowvPjIrlPj+?57)N;$3hTa(*azL#OIJ}3=QVNK$MqbN{A1UQDMIEO-@z$gY(0%)-MmjB;ETbQIi9wRR3~M^?M_&&qQlmUqg1#uT1mChcZ38N* z3bPVN0xWHR*0t=f8TrslrO%RBxzTe3xb-!!y{@I_I?I}3H3eCTko;=D;2<&xaNP zG7UzMP^H{gD);}s=Cb?H&OQaC1$Pfm$=AjAdpFK~I+CtN`Ni;+SEJxllT@^ZwZHs}@uA`=z#<^OlOVC;(xxa8|@0Qu*7rG|yb^xunp3oq*9Ebobkb1NB$Q-jGIgw!M z=UHZdnj4q;GUz3ASAwA?u@+Gh0T$A;S%DnGXpE41qW%1RqH8&jmWv7t&qk}!!c@_< zj!s4mgh;NLtv#;x2yolBEp)xKmVN)+Xy{^~30#10Bv;~QrZ$D8BSH-iOl>41m0)28 zj#?kNYt7FL7pM@aR$j?$DK}&9@y>$92 zAKJxdkq{t#fWnNPS66fV*s)p*HCKXvngnP}xdc7Th{z@;Qo95z4 zGkO%R_V}ec%heonPi^c82m*pNRiOO3ulGuXQ@=G~~eUn)_{gkC-0K!M_DM_V$mJ(=wIcjbC zT80-uno=QY8CclUqmsnR9Xh^$%sLyU>MDQ;-@o$Ky`M>ce#R`;1a{Hz zCOl$>GD?smF6o`#_DH3R?>#dhr+cM$O8nFpp*Hy$vp@u>G5WJ;E}Jp+DZWxFeo55U zYeY479d&Kr-N=EqmU#_R&?rA+CXWEM3&w}$vPq+5u2%@(z(H-DYQ4vE>F4kNrd3)m z7p>BBnO1)=9%jGGzE3p z-#nlAM(;e|GlO&~tww-zABxnpRHGuw()-rB4vctt93_a*R>zO{V{`#>Ns%9<(W4oZ zavb;PM?1ImM)LzbqHK2$PtU&GvS_|mA*N~qBR~DrL36ML9i&G47%8`Jba`pVKuRQB9^oPW<_wPuV-vFx?8nIxl|h+0@xV6{xq1P)bRMAw$v`^U{?ba`sfB!IKaSQAqS z(1)$idkJchV$c46AB|`djzv?M&QupPGpzt!zJ7muv0tOhG8;2Kh%;r|8M$pK9HU-< zRFZb2Tw9I(ddBpr7poit!l)M@$gu5@e(-8UnbXJU&K2yD7@)@%3rKJr2(TeNn_HjW z|Jdx8{hrhShIACTmvPN!%@U<)>VJgaAixE1rDy-2yH;0!8lN*G-0`=eTbv$1c6YOByA1~ghGFsS|P z5&MMPTwg`YZC@HS$AEOyuLPMP;ejs-%Z<#Wj_c!S57ycTE+p0zLHUwqYM*p1k=O6$ z`YQTDI=Ux+^eM`qIs%NzuZLh#h?PT&yi?Lq^?sl(|B?H%Jyx>4Q^l7YPg3keiZZAb zpccW+$d_+#e*Ie_E%{L-=li+udl!e4iYmSvu)e<`NPkD;LpE&d-Eb|Zpvrcf5-ZW>_hL9 zpfO`Mq_O>4wro;mxLhumBZ(aKsijbp8Z7pAwp{K@LhA~fv!ODII*I@_M1SrB=}Pd` zpMU(S=&ABc-E783sHvIs$2&p~aqehq3;Fikdsbt1Wd=pspfUpd`u*)CBtZ@GGv>LV zUj6xhNAPFH^sAg2wjpd)hLkAK7?}~;5jg}?_f4V6D~rlLKx2Mqc-en%RC#i#O&gvX zb=^HYRrRr1LUPH8{xk?!l9|%JBgQhOxVajU-jsbWpx!ds_dS+OGHzYwp3Pt%tv5WE zD90?q)&du+kbNbbx#CHTQuY#dN?BW%rG*H8B{S5_To-$zwh0WNl~lpF-5^KJX-TQl z98L!T7C`j(98GDgCrv^%ipI~bv9n$1}u0?Z&(VP|{OrpPZP%G3Bz&2%q%UcZ^HOHb5) zRbZ{8R3ME)*pn*1BSxO<(K+;r0wqUddkJcWI@%L1Mk1*dRC5JOZT4!9`m_kpm^M>V zTFX$wJ=6jhB7tq&w$u)P&6TT0fSS%r!(2d1>y|<4jDr$sYPzSRIQ<1kAyt5yD^$s# zht~5My&}X#Tgw0u=5g8+&tZj;-y8vdYM*MN?ObxC^YPv5Ux_|iu5BNY8*xTXbE37_ z3N>Tp$Qk(1etx-g7mxNsk>W@=q3sb`C-|uCPt;x?YFYZ^;9qj~2-aTVODAuSlwfRc zm>wC9*w{VHk|zbfIlKIf=^NedWplJKR__#Vr84xL$4u$zLNE~;)FZXAdXKq(cDa)6 zz4=#3j>C||SJ=2rWkzU_p~pTNt(kE*wVJ&}da;+F_VTuZ2yjtS#bFblYHR+cM12392BLyE5oJRTW`S|XC^^3iEjG3eCDbNSF0JYN7)N~9nLm5N3vgk1hx&^b9 zHP)PZ(b*UM-CSQ4l`nK%dd&%hIiLwVF|#*!Qz(^l=uTF8@APodKDN+xy z=ID<|4O&AVAS}=44?kag@6-Dq+p7IqkPa1KLWus-NLi_X1kVi-;AHH7<>yLFBI9#! zTFuK_VVM@Rhd#iQF+m z4FYUT%fXEmwog1JEA? zsDKjrxods*-$$l@0BIn=MwAXl&}RtH4+PkNP;|EHaRFup0ZxLiS&Q%h>Og>nwAj># z<}W~BSP7zlBk|=9Y9La8G!URLBjtnm0P>&-TtLrhCaK3-VF{ee&Gpr@KF-z74|G7K zDxl{c7BK!tJ7snCi;U` zP_YWxw(W(Sq@%G=VgoC|o9nA3&si04Haq z+47zqMA;HdA-68j9AasWC(fDv*A z9!5yc?mr9wWgx%=T*<^XJntz%#0O9hO|uBTwY@2SD>GV6-|%Ii$tf2AJcns84QLe! zUM`nQ>x2scXM!eh21Ho^Yk>e0(IUT4W*8zvfP82IN6;cY0B8ddAOM^e1h^11g8}kD zfB5a41E1p=gl00H2%AV2^(EeLQyXa)nMfdD6jZ88C5K!B4$VpIS*c$gMo-{fTl m3jhFyh-XyyM0Q18AInDrh200007h!K|+-Z71~<=B_JRoO3-Q-l`6LA*4DP#itRi129@@`ulwyVcQSX*%sF$; z`JK6E2wlHE98ExDrTW+GP^#M|oc9)ECL?QOx;#Ne4KS88P(M&MGw7e=j8JOj^Fpnp zC=XWp?&lQ#_PcV<#>&VW=&KVpZI~09z8*_XkVn$&u^`OXN9^w-_VLGrw<Y02B%C!Y1o}x%>e%4@q@lz18MQS0t_`sc@#2(3do@a4-l_X)s{DT;?Fzkkeefq~& z6sfhxYLilXa1Yj`sEG*79I#xF%O$Bso-fGbLGwTS^bWzn%5;0LLsdKMeLJw65Z|x$ zdsZy?`p|*m1>Xpd^#(eKj`a~C;{HfQ<7alUTU9-h;mWawP3wWdUIOi=#d88#6#IO< zwmcnJS=GXj8q`F~c5{P{a=VW5&tG&8{oXsw#sA{mrQs1$8I;V}Rawe`tjvL|?5OhG znB&<|$8%$@3iKQG&9ynrHt{p-pS)vUQCakN>~z?N6dTI^_*1QYVBzru9A zx`*c_PP*Gwb=-iCU*etnOjY}Ob*i2qN1egid)K*wX{_sm zv1!AVPUdNGFfXA`$E>@$8rDYj>h2tBT*_+ z(>x6sJ7~=@gftu)#m^cV%2pKXOAEa^g&%eMc6n1x!LT;xz8;wC8`T3%}VB66yP#kb}c&kibek1BoT-Lmxs zy1IQId|g*#|A)xgP$XS-|4izG2X}bHk z$T=zIFNSDp@|Hfd>bUSC7&K$))bS2L=wyjwFnx}Mk)nRmzn>JzA{PF6!~nJ5PkPA@ z47(ShX$Z{*Cu=x`=_P@w3sP&Q&ex5wrJeJ0zZlJ$*sAsEjuk z_o#JN3{@WJ3p%IQ@`4NZ>zx$^Mp%TH@HkZWmP}y;a1oL_lJmPTb2zwxAKrtv^EKUzZdc~?E)pVyon*ihDD;b8ia4I=#wPa*d;EgA z9>Fe4FL0FuF4BR$e&_xC!y;r|F0%dz*)>B9;CSA#+(OnEkMm2D9c`BNr^2VV)l zOBwY@w#t$n4AgMx)hRMri|p!;DYCNcn;Ej$Rm!W6WKpi$Vg_<={*--_M{yqL&jf0m zMH%;T=AbY^mylRrH-_vb+@GO57d8i!mI1_kfr0eF$245>c468>N){}#MjLm`JedkW3SBv!u}?sL$;#h5&J^YHFMgN1w%h& z9{A9a-Toe6gF#`#r8A&f@ahEhdM1n}$7oAvVz8qaNS;6rg*2nh* zu?@#40Mkk9c zm1MF%>Y@twTh%S<7 z`{cl?lq`Z3G0Cm9Wr;x0kvp63e4$GA|LJmc10^FEz7VSST7Qg$Q%7xs0@Q3}6?KGA zVY?`w>NqFJ8 z93sfW0EwwRAM&~6UhQf=Y{+_!taX$-iu16H2w$(snh?UXZaY}imB{UNe~Ar)ulUv?M#srK^uJ!185}sXK?^l=IF(Q(X=|LQDCsh8~g_V z#LahfNdyp*&bK0TeIgSbv6;Sfo+pp(`i(g~a@l5DgLUkf1F4y3J3T?|O@MHPh>!4d*cMPWps0XJC3G$qf+I17fY&;mdW zTjyz42GY=CRl^uQ13)IEdmhkZTN5}Mj2dT1<+Q-rI;M378FYH5B`HLLX($2>Rl3I( zQ0Ag13#@CYTo52?L!H92@46r8bW8TTdD>>>h7JO$9T7^qk~o4}IxthErYu-flFpIO znM@W+mK{|tpJw9qYsCg`IGJ>}QeG4mx?e$v&opQw3E}P?ed!I&S>13!#aPIPBbd8A zfWhT;fFO-6j;fBF>=nOlYx|Y6uf3yvyGGTQV1qcC4#(a3s~w$P>bKX(7ogQ|ukB!} z9e3?Iw$tIR@5za=*E2BDq@qf7|7-6rwvIXUeg_HPAErrD;7^3&*SO)u?+RTr=rv^ z|7xGZqNGe#oZ`J`#TfpE5OQ;wz?;|pJMWL}v%HevPWPIf5%(v#eO7JTgH zhTc$)mWeK!Jm;T$CgbEUn-K~edU8K1R*EP+hhh%yTrfq8wK9EaqW|gD~M9#!?InkY_sv)`rKn{`)$?V&3*J{n{Xf3nc^@b_~6-Z z$BEdo2B{a{zc>7azGMPLmj!?L%Jy;e;!hZ;bNBtm!`r!(j&t9iA|17J>YerYJq|Dwsd$CE0PC;VbFFvcCt+m{_D0-K)z?yqgsJw^u|f3b;$Y@jJC>dR literal 4735 zcmahtYgkiPwmTs}cof4^qya-sAVF}51|`0l1W*V>AmQ)`6A>^Knu2JEkD0qwel#f)#)AKj@aIP!lQcckJ;bOIqR(FUTd$l z&OV9Wvqu21U|~FSEa*hRoqPOmW4tg2_U=#1l%fbsXajl!Kpu=S-)~@|QOTu&N}`m~ zy=!(jNPc~59I=>J^B$x|r5^YwX#E;S;2L@$9kuEUe<9J)QCs3NGNmNx-t0Z3j8rKp zO)SnPWu@*GlVs9Nh>PO!1S=t{I6HmsZt?ytP)|D4vmVtGNcto*ZQcaNa{m4SCnO#N zSOAcv?ta^JQa2^RgA=pjDUs77`C$bo%CUgBHY&M`A}#l>t>zRbQ;+nPBLEdR%0A?x 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 diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java index a9bc49007c..53e7c317ce 100644 --- a/core/src/mindustry/core/NetServer.java +++ b/core/src/mindustry/core/NetServer.java @@ -780,7 +780,7 @@ public class NetServer implements ApplicationListener{ syncStream.reset(); short sent = 0; - for(Building entity : Groups.tile){ + for(Building entity : Groups.build){ if(!entity.block().sync) continue; sent ++; diff --git a/core/src/mindustry/entities/GroupDefs.java b/core/src/mindustry/entities/GroupDefs.java index 3d2dcc1580..60bdbb5fd3 100644 --- a/core/src/mindustry/entities/GroupDefs.java +++ b/core/src/mindustry/entities/GroupDefs.java @@ -8,7 +8,7 @@ class GroupDefs{ @GroupDef(value = Playerc.class, mapping = true) G player; @GroupDef(value = Bulletc.class, spatial = true, collide = true) G bullet; @GroupDef(value = Unitc.class, spatial = true, mapping = true) G unit; - @GroupDef(value = Buildingc.class) G tile; + @GroupDef(value = Buildingc.class) G build; @GroupDef(value = Syncc.class, mapping = true) G sync; @GroupDef(value = Drawc.class) G draw; @GroupDef(value = WeatherStatec.class) G weather; diff --git a/core/src/mindustry/ui/dialogs/ModsDialog.java b/core/src/mindustry/ui/dialogs/ModsDialog.java index 9b9e40232a..322fa8f365 100644 --- a/core/src/mindustry/ui/dialogs/ModsDialog.java +++ b/core/src/mindustry/ui/dialogs/ModsDialog.java @@ -52,7 +52,7 @@ public class ModsDialog extends BaseDialog{ void setup(){ float h = 110f; - float w = mobile ? 430f : 524f; + float w = mobile ? 440f : 524f; cont.clear(); cont.defaults().width(mobile ? 500 : 560f).pad(4); @@ -153,7 +153,6 @@ public class ModsDialog extends BaseDialog{ boolean anyDisabled = false; for(LoadedMod mod : mods.list()){ - String letter = (Strings.stripColors(mod.name).charAt(0) + "").toUpperCase(); if(!mod.enabled() && !anyDisabled && mods.list().size > 0){ anyDisabled = true; @@ -170,36 +169,27 @@ public class ModsDialog extends BaseDialog{ t.table(title -> { title.left(); - title.add(new BorderImage(){ - { - if(mod.iconTexture != null){ - setDrawable(new TextureRegion(mod.iconTexture)); - }else{ - setDrawable(Tex.clear); - } - border(Pal.accent); + title.add(new BorderImage(){{ + if(mod.iconTexture != null){ + setDrawable(new TextureRegion(mod.iconTexture)); + }else{ + setDrawable(Tex.nomap); } + border(Pal.accent); + }}).size(h - 8f).padTop(-8f).padLeft(-8f).padRight(8f); - @Override - public void draw(){ - super.draw(); + title.add("" + mod.meta.displayName() + "\n[lightgray]v" + mod.meta.version + (mod.enabled() ? "" : "\n" + Core.bundle.get("mod.disabled") + "")) + .wrap().top().width(170f).growX().left(); - if(mod.iconTexture == null){ - Fonts.def.draw(letter, x + width/2f, y + height/2f, Align.center); - } - } - }).size(h - 8f).padTop(-8f).padLeft(-8f).padRight(8f); - - title.add("" + mod.meta.displayName() + "\n[lightgray]v" + mod.meta.version + (mod.enabled() ? "" : "\n" + Core.bundle.get("mod.disabled") + "")).wrap().width(170f).growX(); title.add().growX(); - }).growX().left(); + }).growX().growY().left(); t.table(right -> { right.right(); - right.button(mod.enabled() ? "@mod.disable" : "@mod.enable", mod.enabled() ? Icon.downOpen : Icon.upOpen, Styles.transt, () -> { + right.button(mod.enabled() ? Icon.downOpen : Icon.upOpen, Styles.clearPartiali, () -> { mods.setEnabled(mod, !mod.enabled()); setup(); - }).height(50f).margin(8f).width(130f).disabled(!mod.isSupported()); + }).size(50f).disabled(!mod.isSupported()); right.button(mod.hasSteamID() ? Icon.link : Icon.trash, Styles.clearPartiali, () -> { if(!mod.hasSteamID()){ @@ -218,7 +208,7 @@ public class ModsDialog extends BaseDialog{ platform.publish(mod); }).size(50f); } - }).growX().right(); + }).growX().right().padRight(-8f).padTop(-8f); t.row(); if(!mod.isSupported()){ diff --git a/core/src/mindustry/world/blocks/environment/TreeBlock.java b/core/src/mindustry/world/blocks/environment/TreeBlock.java index fec36ae331..bf7382cbaa 100644 --- a/core/src/mindustry/world/blocks/environment/TreeBlock.java +++ b/core/src/mindustry/world/blocks/environment/TreeBlock.java @@ -11,7 +11,7 @@ import mindustry.world.Tile; public class TreeBlock extends Block{ public @Load("@-shadow") TextureRegion shadow; - public float shadowOffset = -3f; + public float shadowOffset = -4f; public TreeBlock(String name){ super(name);