From 7690f6aa73d9657c96ca6a0fd35ea96cd9783257 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Thu, 23 Jul 2015 04:20:14 +0200 Subject: [PATCH] Changed the Feeder GUI Texture a bit --- .../inventory/gui/GuiFeeder.java | 12 +++++++----- .../textures/gui/guiFeeder.png | Bin 2234 -> 2147 bytes 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiFeeder.java b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiFeeder.java index 924119f7f..2b88ef0de 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiFeeder.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiFeeder.java @@ -42,20 +42,22 @@ public class GuiFeeder extends GuiContainer{ this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 176, 70); if(this.tileFeeder.currentTimer > 0){ - int i = this.tileFeeder.getCurrentTimerToScale(22); - this.drawTexturedModalRect(guiLeft + 80, guiTop + 42 - i, 176, 16 + 22 - i, 16, 22); + int i = this.tileFeeder.getCurrentTimerToScale(20); + this.drawTexturedModalRect(guiLeft+85, guiTop+42-i, 181, 19+19-i, 6, 20); } - if(this.tileFeeder.currentAnimalAmount >= 2 && this.tileFeeder.currentAnimalAmount < this.tileFeeder.animalThreshold) this.drawTexturedModalRect(guiLeft + 70, guiTop + 31, 192, 16, 8, 8); + if(this.tileFeeder.currentAnimalAmount >= 2 && this.tileFeeder.currentAnimalAmount < this.tileFeeder.animalThreshold) + this.drawTexturedModalRect(guiLeft+70, guiTop+31, 192, 16, 8, 8); - if(this.tileFeeder.currentAnimalAmount >= this.tileFeeder.animalThreshold) this.drawTexturedModalRect(guiLeft + 70, guiTop + 31, 192, 24, 8, 8); + if(this.tileFeeder.currentAnimalAmount >= this.tileFeeder.animalThreshold) + this.drawTexturedModalRect(guiLeft+70, guiTop+31, 192, 24, 8, 8); } @Override public void drawScreen(int x, int y, float f){ super.drawScreen(x, y, f); if(x >= guiLeft+69 && y >= guiTop+30 && x <= guiLeft+69+10 && y <= guiTop+30+10){ - String[] array = new String[]{(this.tileFeeder.currentAnimalAmount + " " + StatCollector.translateToLocal("info." + ModUtil.MOD_ID_LOWER + ".gui.animals")), ((this.tileFeeder.currentAnimalAmount >= 2 && this.tileFeeder.currentAnimalAmount < this.tileFeeder.animalThreshold) ? StatCollector.translateToLocal("info." + ModUtil.MOD_ID_LOWER + ".gui.enoughToBreed") : (this.tileFeeder.currentAnimalAmount >= this.tileFeeder.animalThreshold ? StatCollector.translateToLocal("info." + ModUtil.MOD_ID_LOWER + ".gui.tooMany") : StatCollector.translateToLocal("info." + ModUtil.MOD_ID_LOWER + ".gui.notEnough")))}; + String[] array = new String[]{(this.tileFeeder.currentAnimalAmount+" "+StatCollector.translateToLocal("info."+ModUtil.MOD_ID_LOWER+".gui.animals")), ((this.tileFeeder.currentAnimalAmount >= 2 && this.tileFeeder.currentAnimalAmount < this.tileFeeder.animalThreshold) ? StatCollector.translateToLocal("info."+ModUtil.MOD_ID_LOWER+".gui.enoughToBreed") : (this.tileFeeder.currentAnimalAmount >= this.tileFeeder.animalThreshold ? StatCollector.translateToLocal("info."+ModUtil.MOD_ID_LOWER+".gui.tooMany") : StatCollector.translateToLocal("info."+ModUtil.MOD_ID_LOWER+".gui.notEnough")))}; this.func_146283_a(Arrays.asList(array), x, y); } } diff --git a/src/main/resources/assets/actuallyadditions/textures/gui/guiFeeder.png b/src/main/resources/assets/actuallyadditions/textures/gui/guiFeeder.png index 06b1ec75e477ac8045ff678db15f58fc21b00415..14e45a569942e9e0342bed7ab220e0c7f67527cd 100644 GIT binary patch delta 719 zcmV;=0xuxV97bCyw5X-9 z(PCx)MA^2|_y1(J#xQgvmymz zT}Be~4{uhZKyK}5klg^Gq3b_S>-Ce9<6!ZE%mxS#T|XTi z$$te14LvR~Iur{K9(sKI_WW7C2ZV<{9>L)YvKxS*xff2GKg$7vq2GG|1Y|kDnD-t4 z0htUC{uUs7FMNwE2AJ6P6ZgV5$Yg+tZ9n}15Rl0LliU8?`I8EeFXo%gv$GABkx4Yb z%xxbgp#WQ3Ti4gkjUvm)BpYDXwhxm~fPZ$o*lZTtZI+QqIKYf;A7-8aUju@}+%W$= zpO63hrKAIVoP+}8Ay~v<{R3?DM|=_v(9cyWx&Deg1)ew$U@?WH0{pIQZ&&&&wgZ+J zpuAUZwJtArgGCJ1KEVF|{_SmRcQ07PVC@5RyL+wHUbh=8VzBlB3d8b`a(P$?7Jo5V z`v7GK7BN`=0K0<`pHmL7`2<5RGr*wGXcPu1KLs|cwQ8qxb#=h|ml@zsbq;FF4=^tY1?cr^oldRSlMPTBR)1Bi!;)-(D(D6{xF7LFIKX}B;-Yk)!c$;g zk_zzm;@h{2`(^Eb1W6{q`QzU`jelUR7T_fgpdR2OI6yW7@KfP4Q(p*K4e0H;e82f&eV00(dYrg((|F!z5PfDgRF0UW>qI9;kZ0FHzMOb_t<`{5_}z$-Eu z;Nv)e12_PuOO??@@E;wbkWhfgaM4MU8-F>Y!w_@9siLre0^_e{bQobyI22g~7Vuvu zf&g65>a&3R#v)!;YlX9M2QLAWPY4GZhzEFh_y_f+NX@I-fz|*3002ovPDHLkV1h`M BMjQYD delta 837 zcmaDXuuE`52n*LP1_r)ejH3I^E=`VOQLATB@N{tusfc?!r#t9YfCSshiuGNgdlrgC zZxmm%T|AtMU*iP`={ZV%(Lq<++$^1X=nanBe zc{1wm^+k+E&fmRM+LIVJIe+hSKOg_B+M(=4GYjAU#d{bfW>r7j@$<(Tt znZH!LWSkImis5EGQ_B0+#Tv;C>9_yg+*`o1l;=av?f!a(B~y$Je9ry<=uai{hwc4+ z7Ay3^qt{NJ%sQ>PQ!3%nw(~(62Lhe`XQZY+eY9xnhBHO=28GN%x4uPovAj6z-?)19 z)3EHHuezQlD6!Aj@OHBZ$A$U(;}=|7TemjsbA7#LSp(x)HTL9_@(mw_C;6{BP-GCy zb;0LBfy_>3gBmZPgokDi56@wJan^n%(Ca;X)34q>^{wn_ncqC73-jxp8s{)d{F(Ub z{M)Nn-`?JNi?L_^fzJAgB0D(K1npp2YnP74lggr5}C-9lbieZ*VTJB zQY>fuV3d%xux#>RT({o*_S>_svw{ARYd9$X@QcAjCY{pk`&nDx37tN83SHI_fYSIh-)$=m{vAlcN zcJJ)3d^hgj|NnRQ=FQ)~F?ZKFr_sweV-r3SO8D8K0)nB!Dx1RI@VA3gjCv3;b zz9Zh=I(q;7gTW1#cXo-X)g3nfFZSnb7EWSpD`5D_u>Jt!DanTa zqIQPg<_272*jrvdZDaio7c$7SFk3V*8ypqjJ8-Apf`Qu^$g^OWK3kKo zp}C;pBjdb%_BIWzie6F=zQSZqc0Vw;Y7x+MFxc~AMo3lsxdMqr0x?=Gnj$Z1O%Erw zG!<-QSoR@W{Sw2T1wYfdzV~MCS$j`(@_%-($$A{p1h9ydlH7xb59PUUG%