From d210f6c47c3bb22448d9fa6b2780d0f65020052f Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Mon, 25 Jan 2016 00:29:28 -0500 Subject: [PATCH] Interface fixes --- .../common/network/PacketSimpleGui.java | 2 ++ .../client/gui/GuiIndustrialTurbine.java | 8 ++++---- .../client/gui/GuiTurbineStats.java | 6 +++--- .../tile/turbine/TileEntityTurbineCasing.java | 7 +++++++ .../mekanism/gui/GuiIndustrialTurbine.png | Bin 3721 -> 3723 bytes .../resources/assets/mekanism/lang/en_US.lang | 3 ++- 6 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/main/java/mekanism/common/network/PacketSimpleGui.java b/src/main/java/mekanism/common/network/PacketSimpleGui.java index 6a2d7d713..4d8902f6b 100644 --- a/src/main/java/mekanism/common/network/PacketSimpleGui.java +++ b/src/main/java/mekanism/common/network/PacketSimpleGui.java @@ -107,6 +107,7 @@ public class PacketSimpleGui implements IMessageHandler= 7 && xAxis <= 39 && yAxis >= 14 && yAxis <= 72) { diff --git a/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java b/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java index 4dd413f67..239736ec0 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java +++ b/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java @@ -48,14 +48,14 @@ public class GuiTurbineStats extends GuiMekanism fontRendererObj.drawString(LangUtils.localize("gui.steamFlow"), 8, 40, 0x797979); fontRendererObj.drawString(LangUtils.localize("gui.dispersers") + ": " + tileEntity.structure.clientDispersers + (dispersersLimiting ? limiting : ""), 14, 49, 0x404040); - fontRendererObj.drawString(LangUtils.localize("gui.vents") + ": " + tileEntity.structure.vents + (ventsLimiting ? limiting : ""), 8, 58, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.vents") + ": " + tileEntity.structure.vents + (ventsLimiting ? limiting : ""), 14, 58, 0x404040); boolean bladesLimiting = tileEntity.structure.coils*4 > tileEntity.structure.blades; boolean coilsLimiting = tileEntity.structure.coils*4 < tileEntity.structure.blades; - fontRendererObj.drawString(LangUtils.localize("gui.generation"), 8, 72, 0x797979); + fontRendererObj.drawString(LangUtils.localize("gui.production"), 8, 72, 0x797979); fontRendererObj.drawString(LangUtils.localize("gui.blades") + ": " + tileEntity.structure.blades + (bladesLimiting ? limiting : ""), 14, 81, 0x404040); - fontRendererObj.drawString(LangUtils.localize("gui.coils") + ": " + tileEntity.structure.coils + (bladesLimiting ? limiting : ""), 8, 90, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.coils") + ": " + tileEntity.structure.coils + (coilsLimiting ? limiting : ""), 14, 90, 0x404040); double energyMultiplier = TileEntityTurbineCasing.ENERGY_PER_STEAM*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*TileEntityTurbineCasing.BLADE_TO_COIL_RATIO); double rate = tileEntity.structure.lowerVolume*(tileEntity.structure.clientDispersers*TileEntityTurbineCasing.DISPERSER_GAS_FLOW); diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java index 0976e9f36..d1d9c245f 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java @@ -13,6 +13,7 @@ import mekanism.common.multiblock.MultiblockManager; import mekanism.common.multiblock.UpdateProtocol; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityMultiblock; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.generators.common.MekanismGenerators; import mekanism.generators.common.content.turbine.SynchronizedTurbineData; @@ -120,6 +121,12 @@ public class TileEntityTurbineCasing extends TileEntityMultiblock0D`wD`LOX7;VNfcU|V_{e8dRpIBd_FLNTH z_IubazVYD4ewY15JG23gXV~T4Hf^~lL*K3a{`i{qZHs!TCg-fqBUJYJ^{3V+Ia=06 zk2v%9X1{ofH7%y+=I11l95L*+`tbGB%f7%Bsnk)g$ADbm&AZ#*sGnHVcRtQp)s~Yd z1(aOYavX(A^)#4>IBf>om&#u^m&%=!9qjVs-~r}Yjl&hVq~6lexgV<1|Berl+_gA> zdsqIv=CD~I5PL7y3@TDJ1B${PCaT72%g8Tj&#w09$dK;vG7PAiA4v)a?*h@PH|Y4I z@MnTS^@j0JpUPrlVjT234an5F%V;%lP9qPQC@4=)Pd9J69RFC2kstsicx8lNA_)Rv zrd+}12}Bcg-poMTjz&BX|6Ol05S=WP9+I=r0H_6;7_Z^KC|a4Gj;j8+V#^LW+`xi_ zH0CjigGdHU)pZn&l;?D+=wfGijo8Yrr?HQwbL2})OU2`Qvr++=dAua)=tYPFO$D5+ zw&l*u^7(unpKg{sxUMGi2$*qjIKfis7V;8~^eR)5)KydA!d|zH`-0EdT$`+>by)Cd z*2ibst^}c=Cq@A}ET~E-^b~E80V!B=8(Jur?F(eudnFD9V{ipmUMf~a&??v0QIo6< ztt>Q3IBiNr{zV@7A4nW-X|?wS)OF|Y!N{GCzF)NHcw|~*?_YtorwC^TNB0e6qke!e za8O~~!!X*w)fGL2=-}1}?pV%aSPetN8NX#2@N^0-eJJQ9sWO62M3sxnfK>CT=(iht z`(DF#k2{OW7TRP4U$>A}Qb%L3<%R=H@s@p1F_i;&UmeXSsnE!LP(|EqtA(uk(g<}A z70+IP$Dk?`rUjs2q2+K(q}mF-(6UyjWoJyK<3TznY{lE!tuxwt-Iw_dwnEg>?pgnONxKZ;_!Q6~CsGT9b$>9-+EmxhP|W>F4y8}rl3%E_nwf$q z=)wU24JWF}-1_s&_cY?mldx*wReyg&S+mpggrf%58LQN5CGfz|(9r1oe68{T0z$2b z-x|iQG>9oXjDmhK#ipV+ur~hYfEfUF!6i{Zm&Q#~QJ3Z_E`3!S_OG~p=y`M%HJ@l& z{;oF2n4`l1Mz{Nu_gWPKd!@mk<_#oOf?s;{tMYS4?%(EZSy@>g$#u&%_iy%{%e|2F zfPcLwNI}6$pWGjh;4%pZMVn0zcHR1tkg^}pdp~8z9?ry4Y zRJzZ78GwCAC9Qdqo}A2{$@wqr!jFQ*?GrII=Hu`5)VTt1bmto%;Cg_)A|U8Wyw-$3aEp5{(~ID6c@*=4T0lz#watZujf delta 1430 zcma)+eKb^Q9LJw~&z%gnG#E2hrWsUJhGEJ?VF;x(9Fd8|SdnVUqQyjWr^pClr&JQN zti#z-TD7y$Fq^WDmo%lOWxcFk6-Q-|_q{spIlKGUK7T#WKcC<4`*NOaS{ALw3E^_Q z++F>Xp^;u!zZDK-;CsGk+~gEFSl4d-;i}eUlJzqV#GRI52d$NiAH9iL4NlBkF+(ng zy-hDyEF7C$&Mc6oA)7@ud$cru9-?)iv$KhA24b| zUD%vqL;QjCk?nEjc=4Wr(Sbb!bQhXQdp#VN-=bx`SLxALc&RiN>ej8`KybOXB`A+< zPt{H&`vS+W9LZu8LdH~fQ4NTr4j&no4EerApAw?kfg;d7t8uQyLa?6^e^eP&dth^X zW?xcLQXq%Jp`CtCLWr|GSrBN=Y$GJ!S2r~^o$cps*}o*msUGuC{?4{?hQ%068i+Py z)pL_k*3ox^E5el4++bZp%-%)OX(gb_m{2(Mak5ALMzt_KeY1N)WL#!@HIxb|h@?$A zm$-Z&40*27sHJU7j77@rto}w3{XiX+qn??W$-el=*5D^JF2`?<{fLa|m-QQ8v2Z+i zOQFauvZ?F9=Lqk>r0NHgLASG;YtRRUUn;as^oc0KrxUQR5eqgjpkUD%4eG&=4JSje zCz>}t49aKZo&SLZXnJM>PPG4!g;L@QDXS5td^sS4wl#u^r3o-C@PqWiic_SKE zEcMajTaqYXy#@_9V$PD_{<`W%79l)S87OvpY^%N0jMN7&)jx4y4P{YkDnZuaGs<4f zaVKsft|b&rR~gOQaD(H=*TijSSOJCghiLsnIeNL*az)%IC>y&_YcrvNb-2^J0XItg zj>2H)JpGNdNVE74&2Tz2J4t2qE!6$pWsZ0&91gucQm{?RkI0EmjX~^CKGI&CcD<77 z3m%rjzz$89gA3tzo%66u$A#90SY2+R7cxxlGWg=Nm!eN*3I}hHUYn9ASSU4RgKA^5 zq*?9BsKvMUJb`CQi)nqibKnY$Cyi%c>tD4 z8L&G0C{KyNI!eTg42wk-uoe|Mx03GypEDzkkoSeT`vdD2RvYuA+WQ(?%=vOqaM~W0 z;_{>x{A9!oA}}7RJO%L(LGS@V^SG-7daQ>k`waZ65E}m-Fx+J@M8Px3P~xppYSvO1 z;yMiWm8;wYLUG(O*(`m2rHKCEo53+piO+EPcp|L6mU%2CO_BR<>Q}Uc=$~mrt+t?5 zKO39M;`WS8#0>Pt2KKc%m^2K-T`6};!47$Rnf&&a_iLU!OL+Qf%%yg%4i6!3i*VgK S{xuQ_@Z;sdbHC~)IQ|!$h+#zl diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 62b58e3f6..f38ccb43c 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -486,7 +486,7 @@ gui.moveUp=Move Up gui.moveDown=Move Down gui.flowRate=Flow rate gui.maxFlow=Max flow -gui.tankVolume=Tank volume +gui.tankVolume=Tank Volume gui.steamFlow=Steam Flow gui.production=Production gui.blades=Blades @@ -496,6 +496,7 @@ gui.vents=Vents gui.maxProduction=Max Production gui.limiting=Limiting gui.steamInput=Steam Input +gui.capacity=Capacity gui.reactor.injectionRate=Injection Rate