From 08a3636e721cee824d483711d5e9a9c80c5216d2 Mon Sep 17 00:00:00 2001 From: Modmuss50 Date: Thu, 12 Nov 2015 20:59:58 +0000 Subject: [PATCH] Fixes #260 --- .../techreborn/client/gui/GuiGrinder.java | 12 ++++++++---- .../client/gui/GuiIndustrialSawmill.java | 7 ++++--- .../textures/gui/industrial_grinder.png | Bin 1253 -> 16580 bytes .../textures/gui/industrial_sawmill.png | Bin 1285 -> 16652 bytes 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/main/java/techreborn/client/gui/GuiGrinder.java b/src/main/java/techreborn/client/gui/GuiGrinder.java index c039faf9d..ae15a9b03 100644 --- a/src/main/java/techreborn/client/gui/GuiGrinder.java +++ b/src/main/java/techreborn/client/gui/GuiGrinder.java @@ -52,14 +52,18 @@ public class GuiGrinder extends GuiContainer { if (grinder.tank.getFluidAmount() != 0) { IIcon fluidIcon = grinder.tank.getFluid().getFluid().getIcon(); if (fluidIcon != null) { + this.mc.renderEngine.bindTexture(texture); drawTexturedModalRect(k + 7, l + 15, 176, 31, 20, 55); - this.mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); - int liquidHeight = grinder.tank.getFluidAmount() * 47 / grinder.tank.getCapacity(); - GuiUtil.drawRepeated(fluidIcon, k + 11, l + 19 + 47 - liquidHeight, 12.0D, liquidHeight, this.zLevel); - + this.mc.renderEngine + .bindTexture(TextureMap.locationBlocksTexture); + int liquidHeight = grinder.tank.getFluidAmount() * 47 + / grinder.tank.getCapacity(); + GuiUtil.drawRepeated(fluidIcon, k + 11, l + 19 + 47 + - liquidHeight, 12.0D, liquidHeight, this.zLevel); this.mc.renderEngine.bindTexture(texture); + drawTexturedModalRect(k + 11, l + 19, 176, 86, 12, 47); } } diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java index 9d17f947b..b38ee8c50 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java @@ -57,7 +57,8 @@ public class GuiIndustrialSawmill extends GuiContainer { if (sawmill.tank.getFluidAmount() != 0) { IIcon fluidIcon = sawmill.tank.getFluid().getFluid().getIcon(); if (fluidIcon != null) { - drawTexturedModalRect(k + 7, l + 15, 176, 31, 20, 55); + this.mc.renderEngine.bindTexture(texture); + this.mc.renderEngine .bindTexture(TextureMap.locationBlocksTexture); @@ -67,10 +68,10 @@ public class GuiIndustrialSawmill extends GuiContainer { - liquidHeight, 12.0D, liquidHeight, this.zLevel); this.mc.renderEngine.bindTexture(texture); - drawTexturedModalRect(k + 11, l + 19, 176, 86, 12, 47); + // drawTexturedModalRect(k + 7, l + 15, 176, 31, 20, 55); } } - + drawTexturedModalRect(k + 11, l + 19, 176, 86, 12, 47); if (sawmill.getMutliBlock() != true) { GuiUtil.drawTooltipBox(k + 30, l + 50 + 12 - 0, 114, 10); this.fontRendererObj.drawString(StatCollector.translateToLocal("techreborn.message.missingmultiblock"), k + 38, l + 52 + 12 - 0, -1); diff --git a/src/main/resources/assets/techreborn/textures/gui/industrial_grinder.png b/src/main/resources/assets/techreborn/textures/gui/industrial_grinder.png index 9a7d7610f33d84151bdaab232439301748fb6afa..6f6cfaef86210a127b9e35f154bc55958123c98f 100644 GIT binary patch literal 16580 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 MkeaSNlVU0T7Y2vRaR2}S diff --git a/src/main/resources/assets/techreborn/textures/gui/industrial_sawmill.png b/src/main/resources/assets/techreborn/textures/gui/industrial_sawmill.png index f71876382c8045c03ea82e80631a0ab8fc8c18f9..39428a4c8c3b4aad05e2edc6c966d929b5996afc 100644 GIT binary patch literal 16652 zcmeI3X;f238^Vd>2nJoM8w6nBeW@z6<~Y5)y!cKJv9fnj3+9jgxqV$N(^!qWK|!{Rd0|aG1;w z2$l!?EM;=VLK_ZG91h#W3nhpe0M?>-35OdE%gNzzBwyr2X)h|Fkoi0(N)W?`>LYQ3 zqxfE{q_F=g-vI8aXs#oVvdGzx70*Nx2w^#g94{1zWXyOciZ(A3i8aj-g{+mxqn#+O zngPkdK7M33u@ojVY#7#DD$S0(z|n@rpxHUltjKgK%@(5CLNr@z8l6dXWYQSqfe*#m z5Q$h)UIcTQyXU}g$X`yBD7jq1gdl}NVWY6M5lbT>nxms5M5RM?x;3J(mL-VfoOo-I z%u<)+T^@H>#+C9Va=utZ*5u`ci(}AD_XoN1d-wIO@p3UlOQX@FQPaMo3s-#dh4H#hQ}AijtvR>qU` z`|LhGX#0Dq-NoEk&Gr~b&HIO`QTF#ze{`4%qnr?*i)bqwF6ZLlFgwKDLc?skEvOCy|LGW1X<)`UE=)vd0gekz12e{PVIo2ca9n5_m@$qE6A@Z~ z<3iKGjB#9;h|mHY7n%lUjN`&Ygcjhq&@?b(92X`cv;fD2rhysbxG)i+1voA=4a^wF zg^36)z;U5zV8%EuOhjk_jtfl#GsbaYB0>vrTxc4YF^&rp5n6!bLes#Eaa@>)&;lG6 zng(W!ARkHz5 zCIisjk9;=)5K9H%DH{OhJ^-eRcZQXD0$_k#&v6Zif7nucWxH9V`Phzn2lcEtL5}j~ z#EFv|j1NC+{dV!GiSs8*3(|L{?lk1z{!MAJJHTYVaEJca*)E1RW}0Mgp6u8pdfjWB zc6g47iNW{3Zfz}}z45*q=Qez~&Z)kx_;yQYw^zE2qFCLKvAVeP@~z&_x8^@0yiA*F z@#0P2l)gHVPzX0VA5!yUlegu+t?gOFXzB||S0^0wa38OqT#%%0DBRodSBC6a_m$Pp zy4&mG?tJc$-RZxeFLBXXtA)?^zN(*@)7X5ze@e#H*i(~KN4z&123EDkH9jni-T{Zy zwZFFL?x_wseJ$h7Rnv%&mWw@$;z)-(e_CEqXL0TItJe*UTkECNW8*+>QBK&!8TGaG zTZ?Aqa2vPPGs$;-35P2V-t4?VX{fobJA`?v?sNyIt@Yb{|~Qb}g(pX|8^IqR9^Rv%->o>$g4kGP-{0 z2m@&w{tJbz?kI&4r`2ER3>)hX()Qaf>W*Q(Zu%nT$y;i1LWjqJ)!iqODZs1jt+*~F zDKnAY#wwU}^+rQmyAOc`ysK9?XLeoR_0{!AafzC3R%!zZ_o@?k)me(Z{!Zie)V?>{ zJT0HID!10I_ssgbj(>xsx>34+V`gTiL+nju^5gmapD37_52~vjd)woRge1wmwas#- ztlRZUD0HdzbiHS~h-$jD_uDo((|enkduVhi1>I>@J_46A;ZY04t%&&W+Rdm2>>QD`w3wH{avisoDXQ`%?^4ZD(71 zj?26{ItyPlIidR(qmX>1B~%|H~&C3FjL<=Mz*rpX_RlTe#{< zX!gSx%hb6pd5xMF^>nIU@uds}|b`k2_p1q&AJvAb@-uFdb+ z_4HaY2)4{y-rP}nA=SCZY<0m-=j}pgs@|N~Q*dC)Tt!_~UV*f>>-o%-o8nzn-6z*1 zsx7C3@}E<-&@9$;am>ujmev>_idb98ba`0;F+Neo1U2%V+C2AIu=>Ayl;oeQ}Iy2ei&P&g- zSGJOY!-m$@){8A6L3!p&37Q+wzy$yzmANYdCQlmHwLBx z{p8YHZ!YLDULD@xuMCv02ujL*Fhe!3_v!CJjeW+>n+%NBrnv)?p#Dvp?uRBJw}>mk zF0k!@kzcik>gd(!mVmq#{2f;mqkh%8@${?HZ`1A=9NyQwH)o8?m;Oqrx?Rq!in2Rk z?KK;0Ij)=wtbDW26T&V_XV2KSp(4zG9&wy9qpA00Vat}UPR6r+fQ!eer)wF}KsgCm z{U;r+&R(+jdBV@J&41)A1-ni393!d(_Uh;EN8)}Hs$&Az`nOzIGLvvC>qK<^{ky4g zzBQ@q*@zi{bf%v2;U&i>vc2Zh2re^hEc9Iy_Nvw$0ptSmou)j3jwS;vlXM<=2}oeG zyf>!OAb6q)m{t0;grVboMqjn+QbI}zcluvl1Zw_?(+{gEmaRBwI{u*EKJwO0tV#>B zLsh>R%_H)23|mu{ljennBsE^!c2V*7QOK0A+gD{3aJj1DRBNum&koZFt^mwEYozMw zv{C}{=G4RkQ&~lTs4RR`m!zFC39u(9?GhlQms4j%2C6pY;5=L?EF;NT;CI|}VPI6` zhSc^eVEYkDTHL())GaRa4-j($vN8kDXHo7n1d~XbdQr^)r}jJ-DgRuj2R2tV`4E65 z`0W63_u?@IVDb+{w&A;)A_21Ij{T2cdXQTKip{5~Z)|b#^O#4>AZih*Hk(~E$enj4 z?!=vns6ckQ2`C%4Z~ck$4>JnQx86ObK|PQGU84g{MAc_V>RDcaY;Eerf$WvYkG~eK z^3jI=Th~3^c_HbK`x5I**SjwU)qnhvp5-dE3MWuKvc^&sUb#)}Z7Y5}XOx!x%2@x? zOx=_|I^-y`z-Su2yFUCd7->ctwNx=ZezblIFxHh2axORK4M0BL9=`6UzhtlbALxES Ah5!Hn literal 1285 zcmb`Ge@s(X6vxkduYGMTtwqX%qNUg>q7;V#ZKs($7(x-pk6I9iVCRnlf)1(!RKSM< z(Vzy$jBGllSA;BvWCDwWl0t*oq6saB~~ ztC*JI4EcA7;Vv<^q_}u?e=HabhFdaXKt_yv3kZU+SS(3NN%r~f&m}^qmz!Fx?g>#& zdJEnX{M$0Z8m1nQO9o}cpj>jtm$)M%hJ3|CzMl8xl3}TbjY)s$h*UhH@F_cT#Z!h(h}iz*V=#~CinjN?}_&K5tKdh`BKHhNN_Omo}*@uJM)Cr)<3>hj2r zr5T%(h2JS}m^bEE54S4=v(%@prt#M=9=F1JpM-!m#CQ3*d>&Q5&!}zK^=jHpit2OW zb7$-jOm3a3_p$G+>n?m#^Z*?GgubNigZM+sqlA8OJCKsvC+|9IpR;LIQAszo4eW#1 zL+B2BdZ;c7r>iI969iO20^eM5g6n4=TeiLVB?gA{QXDe`#(TPwkE zbKxMBHB<$6q*ZC2b4gUgTyA&kaV{O5y?3!cl^kFC#v93Tu}N_t-BeOx|5ahK!biy#asHds>Czi;#>kIrH zy#J(ZtymjPn0^Ve``1HnUl-;mT1!hr^XPAHw?|Q{TTj(&4g$TGOhLN3*%ztKApJ(H z3f}H-85&(51_inky+sr&chl8_rFFNU3wVCWB8oMzO@6m{MO+zb-O~VmV}xdw_kYs? z{g(Sk?G{)#1j@2JO#g(P1SR9sr!jGVc{&jF5t;m)m4occkA;BI z4y<+$55(`bZoi83Tt84Zb;pOq}^>O-iY#q7-an-@9BtS6-BRm#1C% z>gmmx14W_;>p8^8Ut_z$%k4Wz{dpbmv&DUOjKkD$Y z)KPDbkRqncFvhRDBodKUanqAt$F6kUW&t%M*!~kmUc~WTC7Do4BLpU3sCRS=TY^;v!ok^oRcjuh`Qb