From bff01ff787adb742d0a46e23771097073fb2e5a7 Mon Sep 17 00:00:00 2001 From: Sollace Date: Thu, 24 Sep 2020 21:47:49 +0200 Subject: [PATCH] Fixed alignment of the ability icons on the hud --- .../unicopia/client/gui/Slot.java | 4 ++-- .../unicopia/client/gui/UHud.java | 6 +++--- .../unicopia/textures/gui/ability/cast.png | Bin 754 -> 715 bytes .../unicopia/textures/gui/ability/feed.png | Bin 998 -> 1142 bytes .../unicopia/textures/gui/ability/grow.png | Bin 621 -> 656 bytes .../unicopia/textures/gui/ability/teleport.png | Bin 802 -> 768 bytes 6 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/minelittlepony/unicopia/client/gui/Slot.java b/src/main/java/com/minelittlepony/unicopia/client/gui/Slot.java index 167b40fd..175c2deb 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/gui/Slot.java +++ b/src/main/java/com/minelittlepony/unicopia/client/gui/Slot.java @@ -79,9 +79,9 @@ class Slot { } // contents - int middle = (slotPadding + size - iconSize)/2; + //int middle = (slotPadding + size - iconSize)/2; - uHud.renderAbilityIcon(matrices, stat, middle, middle, iconSize, iconSize, iconSize, iconSize); + uHud.renderAbilityIcon(matrices, stat, slotPadding / 2, slotPadding / 2, iconSize, iconSize, iconSize, iconSize); // foreground UHud.drawTexture(matrices, 0, 0, backgroundU, backgroundV, size, size, 128, 128); diff --git a/src/main/java/com/minelittlepony/unicopia/client/gui/UHud.java b/src/main/java/com/minelittlepony/unicopia/client/gui/UHud.java index 6cc5f900..44dafec1 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/gui/UHud.java +++ b/src/main/java/com/minelittlepony/unicopia/client/gui/UHud.java @@ -28,9 +28,9 @@ public class UHud extends DrawableHelper { private final MinecraftClient client = MinecraftClient.getInstance(); private final List slots = Util.make(new ArrayList<>(), slots -> { - slots.add(new Slot(this, AbilitySlot.PRIMARY, 0, 0, 8, 49, 38, 24).background(0, 5).foreground(0, 59)); - slots.add(new Slot(this, AbilitySlot.SECONDARY, 26, -5, 3, 22, 17, 18).background(80, 105)); - slots.add(new Slot(this, AbilitySlot.TERTIARY, 36, 19, 3, 22, 17, 18).background(80, 105)); + slots.add(new Slot(this, AbilitySlot.PRIMARY, 0, 0, 8, 49, 38, 42).background(0, 5).foreground(0, 59)); + slots.add(new Slot(this, AbilitySlot.SECONDARY, 26, -5, 3, 22, 17, 19).background(80, 105)); + slots.add(new Slot(this, AbilitySlot.TERTIARY, 36, 19, 3, 22, 17, 19).background(80, 105)); }); public void render(InGameHud hud, MatrixStack matrices, float tickDelta) { diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/cast.png b/src/main/resources/assets/unicopia/textures/gui/ability/cast.png index 8562845e2f1727e972d82787187f837a5f7fb581..1640da82981ede855149b82f8ebfbc337de42ac0 100644 GIT binary patch delta 691 zcmV;k0!;n#1aijEwzs03dA%{gniaAQC_iKu{9@gaHa(hKX2P1O77#Nq@<6kHPj}^yV_$(^jQ>Rv)dwz zVpMI@tGOaoLWNp$q`ho&VvvCM`a($vMs<-zu}(wZ8>{yGdDS+A9xn9G8ekt=vp?)pLZ{JJZG*!;H9r+kX~Vp$0l=%; z21Gj#PIr=np_gOmM-y0C2jTHF|nK2mPcQx@y5fwZ2Z5^FaIldK)-p zf4!j$lW_?wEc96vYm}S;La(}|80&qWkUy6JntY@;r+=Nx!CLa^UZBzQqT_ceP&PA! z>#T5mdmm50hMwz8{Z7HNDAp`Yu}bu3Q9PT0o+g{>f8COVoIj_5WU^qpf|=+G)!Q`d zWf>+~4q`#gizD{}+rG!Qcg?q*7r=$r^Ctj z#|Z$0x;u?*>7i8QT`g^{M*&Tvav9k}3C#WHLzD40KO-p9fl=|vx%yac(oe`t!y@X< z_iGX$83YCY{x}VcstgkZWvZvA`TpSq3>gGHD=fprYE=Oo;?NUABqo2sC@`f}q60rQb?aIK{uWVA-c-hi}%qFC*Q9q7}2RhM18lW}8ov_260@p>~#jKM^Q59%Y>P{5imW%5?z}3()>eL5E-_Lt~gST~}a8M1s`Ah&1 z-h4Kw57hbENYPmVAUEqm`T^QVUA&+Oyy=g z8?>7eDW)xEcRfmbXmIkY>JmTG5>pvoi52gjFH`$pkbQk#L}rT?L2vIr>_FO7SGwOu z>PoDnA7CoOu7le9cRSEmCDIR^Vr3q-=o7Pt5a3n9JDW?aX!Py>0uFUU!6%~Y5&!@I M07*qoM6N<$f=z#F+5i9m diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/feed.png b/src/main/resources/assets/unicopia/textures/gui/ability/feed.png index 8f954ea15cb0f3a134ffdafa904fd48f7367b42a..5e184a3181379d4291286fcf4ecbb724b811c600 100644 GIT binary patch delta 1122 zcmV-o1fBcl2lfb%BYy-vNklO>Z1U5Qd-bo}Ss+58E+b*2F=Mln)TTgahJ= zlw*WMh~U5-@dFS7B%DMz5^zA`FL2>NBtSw)aD*#S;vjrTP#_UFu@l?L+TNX=?&)q0 z8wZlNLE3s4yNPia>2l{4>2I~=2a!q;Z zj~x++w!Lg(f=n2^_tfVX!yw|V`V$m315u?ue=Y1LQQ7Zsb$|<*>THfhx!N zx8EbQI~WPonUBe%94{cvETxqdHk8OxjSP?!3G35u5_=Hk67r*SxVB;F=3)zB_{t0cUcm&prEB^S$&MNvVT(9&5`~zWVIJ zyY(M0q2dH71pb3*qIHYcnxTb-!2~v%W@&s9)oG%l2pIw{Nl1;synhyvmWiG^3V=QF zA^`fEuYVr|+u2#-(`U)z7?tOEA#g>3D-AQYaAOOu+^#!Sr%5Cw+6kn!NG}jt<@fVJ^)w64-tEtHi+ zEr+Q(pdecF6u=Ml21z7&{?;ubpr}b8B3@S%6@P`(p0cZ8?K-ut{9ACN0TVLFV4<}_ zT2bi2lM9bB8eOenh6=tD5vAbB@|^4518{H+QsrnXP3j!&mc{4}&iKAb%Rythvbc;< zW$dcNn3zHcq&K*>=X+g6#x;C7-V#)#Bec^RB6RT1QO4nnXJ50)j^;qWa@cwur&CPc zB!7)coUheTQG&1*?Q;$;t#D9EbS=iU9YQ6PY{se(D8D`UP6+^nyY*4xIOW?!ql3T% zMNommw{LT3xQZ`2{MIVEM5M%9i&JVK_>KsCacB~v5-(r563!nvf|L@U=V;)#wcs4O zD9EhsiG3LOwmmRAH3h(zM-LOHCE{*_iGRp@d}h!Zju$ymtA*%v_6*+FVFMiCMpi&n zV3a@^8;D9I8pOgfFL*=l1c_4Q&g}_&;64B_nMUDiVTE=g=(Gg6=fuyyh$p2CKhZg??ln*}rLj0yqKkkB^26cmMzZ07*qoM6N<$f>wAT;s5{u delta 977 zcmV;?11|jb2<8WnBYy*}NklO=}%h7{`C-ZRXB>Ni}Uuv|q!yxtnbf>0}&QUcD@{I*TjCfnpeBt@sqW;UTkk$%<4>(t+ z@!3baYrXFlQAvsvg7D59y5|VSFt)ln8oNX@8B35uc`H)?(k9M`U&M(=!0L zt1kgyzW98%*)1)R+?*#*5>#0dguqu7zIKLltG^BfkpI4*iVj*zj2B4fkU=1fAOeFNuuw6^0Pnt&bx6lHYKZ<93? zrV5lIpsc|(TiCIRuY{%+J$YI3O9%i=Z$YL!17*m(XV7<8Q{Zhl^vKI$sWjF$v8s;i zN~}$&gg^$19|XQJO=Qv{)RR3;RrUyjtc8dL!GC+|c)Sff+UXqoJ+S*Y+{6UlWZ1Gp zrfb}4wNN@mIEM)((;IE3rNp!n{JlGXPShn;OBm|4I(AMIlNLMnU7Qe#9NmyBc&viB?h?S9C(kZDst!cHH>OLY!eQJ z)PEtws;n?6T**sxKgR=kj3+W53E-297h=?!dIn;36BR5)6r@Ul_a`zx=oGLtI~xH$ zow*c~tVR+7SHJ&JyxMM4`tAAULogo-uw%Y7I~!%C@U|k?+fn}(g1AxUCyxEd1a@>G z)084|SMXnJX?8XqH<44F>Ou84kRY#PM=dSP00000NkvXXu0mjfkiFNF diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/grow.png b/src/main/resources/assets/unicopia/textures/gui/ability/grow.png index fcf5f223cb3f56b4daf0ea1ebf15d68ba63f8204..713e6477413f765eb543a0275207503455c3812c 100644 GIT binary patch delta 631 zcmV--0*L+X1ds)gB!5>)L_t(o!_8JbOxr*d{th|R{0)w(cB#aOB0&?RE|m&HmW-Av zlqDz&TQV~sb?C;xlt^V`iOSNURmUz26;j6#6viv84i*nnEv@i?5EP1448*vwpTw+Lgy(|aB zJ)&OpqLzR>i$04j$r6H*id_k;MMweNN;fOr=Pa~05dbsl+KKJATC=+C9y!@)0p30 zorUx=b5Re(eT1P9 z^SHc712#4$Y|WeFr{a3493>)w7luYe#>O!rdJci-gMa8bwB}9JOJ%tS__1qPGT3{~ z&ZU=2n-Pzk3PnLtQIesh2DN4sX~(lKpFe#Lv=`Rc<*w~yYsVB7rB~TRq|%1#r7~RG z8BY}~?|(<<=pa4>`KE<@(;~7~ZEPG%^};+sPF8*snZ94N$kI-WU7pzkls?ns{QM?y zy-}%R_i)D-`9PvL@5fHXbG;AbSG^{+?bb{*D%H_av1>bc+u29AX0qqX8z0@88A`qf zdw{l58WNt_8kH(s+d=2(fFae|RaSbk^#^%?=($inP-b&&hb0$9DwdwO{ufV(`mF#L RIU4`~002ovPDHLkV1oBqG~NIJ delta 596 zcmV-a0;~Oy1?>coB!4tXL_t(o!_8K|PuoBkeP5Im7s8MTm8DWfgj5t)VnKoqUNTx# zC`*u+Y++_V>cGaplt}OgM6fV`7+DxlrH&y{ByS8=7grXQr~!iqGlVnvbZ0yKGPhXv zefQnH=l8z*fcG{|ekPCgT@SwNJ!?OTJHWU3@ca4Jv=0D<{C_9_;Gc69nlG-H6a|jY zmyJU&TJ(~PW@Qs!x&x#G)Ih&%(l7^MOrbk?@0Z2QWYX3V@e3a#j~X%!#0_2}nY3M( zO&WN4c>@6Wyu1-+f{XjJvjzYd8yiWKH+2R`CLX2*hWyj_)zCus`ab|b`8Y02{C9sd z#DvU6nW&=krhg0szU9@vxDEigy*eK%@rTjkz$FLkk#2ZDE?~Zvjktf#$1w)t@}|as z?|NvK^aloH6^;2k4ml)ovb;qlhh|AnUjwNfpjpz>uY`uGf#UA-m#Tz?dXGrS!FN5- z{r@*qP0YY^`@AUSGx`lx6ZeF&iYU7cG30GnsQ0KfwSNRd)sUZ@czX@Brj`Hz`N;`5 zmYuvGV2D_4mvux*`T#@K;8=D#F8I28i1z7mz(PiJONn~>;)+RydXM5Z=$B3Uy>LdN z@BOk#Gn>s|^Pw3aC6_4f;^HQ9zEP=S`)E(>f~5VvOatTHAN0$p3Dy~22 zvN6}*MNOxs2hW9B51pDG65o>r^f-(Y^xerPc;7|21v<;^uQ{c iW7&bY7*gJP{QMoh73+#29q?@c00001#g>r;$65>{Ec$On;+QJSRcClyK?ZsRRI# z7qz|pTiKr?L#+z^DhH53wax^PRs!Ga7C8sq$=CadWWS369sTV~w{%QriwSDXfbVtb z@68w8JBf+C{}J>2C<0Ns3lNDIVRlT{qcOW)4q)o^x$cctQ(pD$L;lTlj5|}TQAuaS z!1KeS?CAPMc7Ko^%h;gbq$WrJ5V^#_^^4rA#uRIGaufnU&gH|y`j`A zofi}!)65r}Ra6I7&V;(ZTSF5@DVZ((vcj?)_ycmDkFSiB3ET^Em1mW{4x$6&n> zahU$d_kX%vW~RFlff3bhSUPfV&s3lo=zqGH(Z`>o@aba4BcH7o4!eixiU&2(YnG~~L2 zg_9Ui?Gj{qZ`(i={w_+UfPhJh6ljo2CYjXoYM`W`z{E;e zi>65dp8tgW3ARB<(ZUv)6bzIEOyh~v5=#jPtkg;Y1y)nZ1M$1u*>_Hyh3t`Y{A|DP z``(Yc0ROWk@fu0I{-pfm zIZ;Roct=k`R(@ekgvY#8374+PUnULO6kMNP007!IrpoOBaF0>Qm9p{^pll6f{rh%F zMaTZ-?hF4|`^Mz*E`CH}8gR87ATVurQGb;Db4-<8Qoakme#o=?wsxo*oInXg1-k_{$jNRVV;-^nddJ0JP)Iw&znI98jj{vi^45 zffI#%yi*!zrTaMml>eQkDLU1*O>$Fk`h9(RAp_`NcBPfuDVQq+cC%x@y3ff+s*69LiwkpW zZn|ZA0DoLnJ2qO)Er9RKJD!)(Y$63#y}USokifL#4i@!C6?k{m8^Sj%2x&p1)x_)5 zbFl*AC}s5;=9sdA$32ptZmfF4Tzk_srCHkrx;dUQXPKg76!_g4BQR~OdP98t+0VV- zzwGiDjaE|zKxv?LhcR&_d5KweXC2KZTz2t(see&?g0tLoOox@{M4`9p4P9b6ydUG; z8KW9>d0SI(@*niagr*~nYC0jadd(%4s#!wPXZ<+jrZxc&m7??Jy!G^KQ zUs{1|XNW7Y8{UsOL*XBk(qB1b2Rp%;1Vm&{L8MbvI$u=&zhm{CT@XD00RR9107*qo JL