From 8577283d26f77ebd900bb09b6610279422f34008 Mon Sep 17 00:00:00 2001 From: cp Date: Sat, 29 Mar 2014 01:09:06 +0800 Subject: [PATCH] Some UI and texture work. --- .../assets/enderio/config/VatRecipes_Core.xml | 5 +- resources/assets/enderio/lang/en_US.lang | 8 ++- .../enderio/textures/blocks/hootch_flow.png | Bin 12703 -> 12633 bytes .../enderio/textures/blocks/hootch_still.png | Bin 7125 -> 7103 bytes ...low.png => nutrient_distillation_flow.png} | Bin ... => nutrient_distillation_flow.png.mcmeta} | 0 ...ll.png => nutrient_distillation_still.png} | Bin ...=> nutrient_distillation_still.png.mcmeta} | 0 .../enderio/textures/blocks/stillFront.png | Bin 1429 -> 1257 bytes .../enderio/textures/blocks/stillFrontOn.png | Bin 1425 -> 3356 bytes .../textures/blocks/stillFrontOn.png.mcmeta | 1 + .../textures/gui/{still.png => vat.png} | Bin .../java/crazypants/enderio/fluid/Fluids.java | 16 ++++- .../enderio/machine/still/BlockVat.java | 12 ++-- .../enderio/machine/still/GuiVat.java | 65 ++++++++++++++---- 15 files changed, 84 insertions(+), 23 deletions(-) rename resources/assets/enderio/textures/blocks/{nutrientdistillation_flow.png => nutrient_distillation_flow.png} (100%) rename resources/assets/enderio/textures/blocks/{nutrientdistillation_flow.png.mcmeta => nutrient_distillation_flow.png.mcmeta} (100%) rename resources/assets/enderio/textures/blocks/{nutrientdistillation_still.png => nutrient_distillation_still.png} (100%) rename resources/assets/enderio/textures/blocks/{nutrientdistillation_still.png.mcmeta => nutrient_distillation_still.png.mcmeta} (100%) create mode 100644 resources/assets/enderio/textures/blocks/stillFrontOn.png.mcmeta rename resources/assets/enderio/textures/gui/{still.png => vat.png} (100%) diff --git a/resources/assets/enderio/config/VatRecipes_Core.xml b/resources/assets/enderio/config/VatRecipes_Core.xml index 31fe07bf..9b86b8dc 100644 --- a/resources/assets/enderio/config/VatRecipes_Core.xml +++ b/resources/assets/enderio/config/VatRecipes_Core.xml @@ -20,20 +20,21 @@ - + + - + diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 6fbd2a52..9d99fddf 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -41,9 +41,11 @@ enderio.conduitBinder.name=Conduit Binder enderio.binderComposite.name=Binder Composite enderio.phasedIronNugget.name=Pulsating Iron Nugget -//Liquids +//Fluids item.bucketNutrientdistillation.name=Nutrient Distillation Bucket item.bucketHootch.name=Hootch Bucket +enderio.fluid.millibucket.abr=MB + //Crafting components enderio.itemMachinePart.name=Machine Parts @@ -206,6 +208,10 @@ enderio.gui.alloy.mode.all=All Smelting enderio.gui.alloy.mode.alloy=Alloys Only enderio.gui.alloy.mode.furnace=Furnace Only +//Vat +enderio.vat.outputTank=Output Tank +enderio.vat.inputTank=Input Tank + //Travel Blocks enderio.gui.travelAccessable.privateBlock1=Only enderio.gui.travelAccessable.privateBlock2=may change this blocks settings. diff --git a/resources/assets/enderio/textures/blocks/hootch_flow.png b/resources/assets/enderio/textures/blocks/hootch_flow.png index 7053d0344bce09fde5c4f2340be56cb99e0e60d0..834bc1f89ec27c1f15ee11c77a39e88c0d7918e2 100644 GIT binary patch delta 9997 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 delta 10032 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 b$Gm0Iz61K1;!V*I__uq9opr92XT*O16`pd| diff --git a/resources/assets/enderio/textures/blocks/hootch_still.png b/resources/assets/enderio/textures/blocks/hootch_still.png index 5071c64e65044b38e139a0793eeaf7eaa4bebae0..8118428493732269a3470351c633837f3666c696 100644 GIT binary patch delta 6665 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 delta 6701 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 Ae*gdg diff --git a/resources/assets/enderio/textures/blocks/nutrientdistillation_flow.png b/resources/assets/enderio/textures/blocks/nutrient_distillation_flow.png similarity index 100% rename from resources/assets/enderio/textures/blocks/nutrientdistillation_flow.png rename to resources/assets/enderio/textures/blocks/nutrient_distillation_flow.png diff --git a/resources/assets/enderio/textures/blocks/nutrientdistillation_flow.png.mcmeta b/resources/assets/enderio/textures/blocks/nutrient_distillation_flow.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/nutrientdistillation_flow.png.mcmeta rename to resources/assets/enderio/textures/blocks/nutrient_distillation_flow.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/nutrientdistillation_still.png b/resources/assets/enderio/textures/blocks/nutrient_distillation_still.png similarity index 100% rename from resources/assets/enderio/textures/blocks/nutrientdistillation_still.png rename to resources/assets/enderio/textures/blocks/nutrient_distillation_still.png diff --git a/resources/assets/enderio/textures/blocks/nutrientdistillation_still.png.mcmeta b/resources/assets/enderio/textures/blocks/nutrient_distillation_still.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/nutrientdistillation_still.png.mcmeta rename to resources/assets/enderio/textures/blocks/nutrient_distillation_still.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/stillFront.png b/resources/assets/enderio/textures/blocks/stillFront.png index dc588e13552e9b717e0622d56ed80549f621dbee..662cb545acdd15f2dff3f0819f1006fdbf974760 100644 GIT binary patch delta 1180 zcmV;N1Y`S^3+V}vB#|)~3c>&Y4#EKyC`y2lQz(A~Wl2OqR7gv`mf3RKMi52wae0Uw zg%Ux6#4^}-aFLUer9|Q)%a-%oIXwfw1nEkil&V`S%mBQnr@Lo>pMIW9-c|n>z>Y#E zO}#u^oGVQ2-)QvOtVw|+0L)71AZrDkCuk0~_*xM_-A*wk^` zB&&bci0i1SgSzsI+y#@RXbCKd7jg7mNxak|4mTsp3^5!5m#JO4)(JSF9@n7i*qGVO3rLw%-8^ z7g3n6*T&j7CghO+i-ioim9JODcJut@)kGchK-*F<6xH6U-C4uM6 zY&Iyan-PExqu)tARU)BM*uh%dwe^WRlKk|5=Hti1+nZQ#x2#D6#w%bO(=bLNqD$I>sqL+$n$o=oJ_SS;CqkQ=Xt4w<%}V zoI@%KC(8wUL=}0!rbim{13*^*SwRoD+rPb;Qj_8Hojh?I&d6DyezWH)&qRN0eZk}* zr$|}ERh86~p#z+RF95?p(oSv5hT!xZ0j?J|=k4`;=4Yvq!Tc9M7=xzvrD!M?W49PoF;{ zE@XH({CPamC!`zQKRD_fi&OojZnyZcj^KCu{KH_KWI8eUA zU>Zg9csY;bR?FEEMSqNcMd4Q%PQqXkApf)V?xX?P)qv9vPi%mX_~Cq!Bwn6}t1_yp zW!)%3)rvvCEW9H3^32ULCrh0)S)gQ~G-1$5Q&+C0j1ZZnGUA8Wxj9^|;&q*DH)*S6 zvt~q`s*03qet(~T@8x^HC$WQZLACQT@6z3toMQ15nST@hM@>Ml8iOC zD7}Wi{_li(11pj4mQ+8WTM z|DFM$@tB_L{L_B$;id+huU~q>gQRY21JC%%gYPLpgG`F4YoPkO_ia|#yDP79*oAIriyeh| z{?p*M?gN(4B3{bGQulsVweJrCZ)}E@8PLtZXRGo~)f+74wv)|S>wZRW*35t|m)h7V zONT~5mi>`I+bVt-{81d`vdk4NT&;M+RW$NjgBjbn%YYKGt?8~-BAH(9hoXftaepi$ zK$Qy-mWV~sDDl{yNx}{w{3+X5-%y)YK`-LDM$>NADEH$82+^_iKn8h<%QA2*He;EX zKNdcsg9@EjSl=gnc{jDU>#^&wnORFT5S~9IMA3NCok_>JD*xdnmlxhf-o*3Rw!kM#)Fi&6Q-Mz0+Y7YD4*l0`_CK!ACJARvN4x+4002ov JPDHLkV1jXWt6Ts8 diff --git a/resources/assets/enderio/textures/blocks/stillFrontOn.png b/resources/assets/enderio/textures/blocks/stillFrontOn.png index 2e30c04949284e34124c703f0d0d929ee9adc4a9..2fe648afa23ebb69b019b93e419f481376e3fa7f 100644 GIT binary patch delta 3306 zcmVEW{3!EB|7Ycv~0ssI2Fzbu*?F0i!AlDCw1D`mN!YZCE5PVz3&Z3hiWQOPMj~+ zIrrcIL-O9Y6Ynp74T7(VKT9B~%7L|`y3X6Cn6yjaaa6m3HL2D~RmEkgid^MmnUBPH zfl&uJ9;-Z$%7VU@=YJ~#Lu)}-&Zc@kGy8K7+*h+{F`bN?dI%Y3fed0sr@HzKqcaBV z7&=(#06eY;;HaEVz^I9Of60!+q%7RyeY-z@^5O_GQ9d^K+HCsM^Jif6qzm49+)x1W zw#CVcK;AUftg{^&)qDnT=&O@9E^@E~Kfipj6fm>tzn(wy)PFbxJG}Jag-yV?u2%$b zWMSsPV_fxoPLY{R@Pl#NToO>@5edv^PmZ4ZXn-1qFWK>102Z$Zz5!DOv^GQMrPOV z;_5BqT>|L$U{AsBE{65TVg2FR@f%PhjG(R&30Qea0C|Vu%i;k$tov*}S-tRp%!j}k zneQ&(0Sg@4eKNd0c-$Nu0D3xG5kQ5Z-Vu6a2?0g)VSiv+e*m({M<8|Q00qjP(MJ$) zhz|td!N+m)>FDHys1Fa@!$THW^#E;*g7H9Bky5hPT_o;2Yf0mhKxVxF%RqbeW#;|Bo)6vm$X$%V`k?hzfbl1OrH(R84FyDnh(IZ zr6_?KNp}1DMY~$2m{~D~R87?oFP7p3-W_O@X8o{|_E2^-#%}>mR@(CC)hSN_^o;}N| zD$KIq5*Qx~Dxniem3kWSgvgqYS?lo$&K#^PYX%`s|Cr2xtu@F&L}}h|!R!Ex+M7epkR-9>3(^ z@4ILl+~;_EsB3tMOrj9MMaXmf^?!q%%;)%cKf+4_7A#38;Q?c~e%17V1o0h37phJ&3on$WbuPJfk~se1oQ z_5(o_O92;FEdv7Ngn*=(u)vfBZoVIMyof$-DhN;-d}Nd{Bx5F$%%4T=K{7eG*?z#$ zZ`p%3bTi?m;KGf>iJ2(t1ma_+od<3|uID$~56JKev33CoOaX8S2v|#on_mgQ0~WZ! ze$XrHpfEvU!=maJu3y@qG=D+qs8WsQ5IKnin5pzhw$PZwZno}zu$Q}_DEqnY7rIx} zeNaP^bD&HGfrSSX)F_3>P7~L}u3dLO*c+Q5ufn42A3PjY z4@bH;279rW>t5~O!8UKFQ>YnMM}ujk0up)qVi#M}YSrFM9=Shv8@f z8WPYD7!@=vXh;x9X(DwS={l;cphjt~+7BLbd{}_u!zD!NMaTJx1SJI`glHi^z(mqU zQZv#QuG$a003{g(N`F=4LaI)hoirGT3-+Qvx)9N!rg~L|zk^v)x@-0WuydJ$-J(GK zknj@%fUyw?zs5*Vl&7=F=yK#@^k4Cn@Q zFh7HaKr*bP8#@prKpw=+@Mik~c*$O^LLCK~4QByqDf$pV&>*l35d?0!A4EYF2`%~+ z-2@9IWd#J3l@jT3EYJ)i7P!HF(APS0NbgSAP|v2rfeio0`LIr4GAPooHXg$`#}|lT7=LrQQx3Cv(O>E zodA-7_@I7-LlcZ55*Q^-mbOXUWNYjPg?yB&py-EXzh8>IQuRvJFI7+>P>C`^Qo<9- zH7cn_$$yWyh6hnxr`PWXk8%jee$nq2y}e=~&}9O=z5`McAPoW+T1r$dCdJ(uBD{8Y@gU7C<4< zEPtX=NCI>vz^xU5YxV;W;m2HyDH=6u28u^pcj7p7XmXt)u|bsx9pCN;{^WK)_!{`L z1a9|(Z+<_J&9y4^$&LKcb3xS9QZnhr?w+Tph zHy{B3kE9fn?YQ1mB=Eos#4K=={lIRA_MWgC!rl$-7Hf0@S$l^B+Ita|&;zyfV1Kfc za+KEE4|--x*gMb&?cF{E>?WKLjzW}@z;4`ZP=U3GekYJkx6}wI%779;0?me^%HF+dKY;CC0Op704hIJU)VU17J@-46mX z8F9cBWkt^~q(@l6EGhsRmct7 oPNBEkh|leQ;7`86{U8Yb3sRr#OAwSPKL7v#07*qoM6N<$g7&8jb^rhX delta 1360 zcmV-W1+V&?8j%Z-7Z)H10ssI2{21+{00001b5ch_0Itp)>5(BD3c~;Z4#NS*Z>VIE zMks#;07*naR7gvGmPvBsMi51L9*5=V-br36S_37DBxVpZz)>Xag;&0UZ|#?vg@Njb zX8a(50`Y!kR#gJCr`77k^Im;_9t7`E_#Q=zcoe7TEez2-4ET@fHSk6LM1c_8Ro{pC zyj}yJ@iX^*C?83@Ow)C?S!Y?V&1!>E#y@}3 zN!w<-ZGPAnz4HBz5pn7|uEy#V;iP60$q3_dQ=1sUhPZ*xC@w{an+8^SJXEJs^?84i z@6(af(PpFIw2w%4^KsPvRzVIBSZYWXKN-qZa*>HWX)?~J<=$sAyC zA$*RRd0nQx0bTmn833Bk>A8ORdT+vyQ$D}QV7=MMPNs3wT9;|Uz8E^9$$A-G1rP-> z4?}Zo)4+<;}3VFtE%;9`GZbTg2BAXDwc zsd3`EURtxmz#a*9fjq=RZNjpMsxnpsBEsY0;elh&9B`@zhl=f{D$#y#oUkleLej3E z*Q;0GV;XoW(6@U7$$&pumru1JZ@SK)eDk5uhaC+8OR*?i^!EIC`P&~&V)WO(7-`Y=}nW=wQ;5f^4fpGONU*6E_HX6`ARnf zIhELjZfJ`gB~|s+;6?WVOUTPMGO^TsoK@}nlfa$Lv@#RA8ANPV-l;|dZ*4o-oVD&Z zbhlJ3(G;~@h|#I~lpT8U(O zxgUxa%EYmZ09Ai3L|7sgg;O4~J@cF$K=@0xvA&_YRzWY~xkl4=Yn1zO0)*(;dLV29RsT$TUulFJLP zQ@992_N|G6QxfPbA2yj7;DZNwZ~^fT%m(Q_6ZP-tRA3+w_l^Rsu|t1at^Nm))iQ!E S{DA`i0000 { return super.onBlockActivated(world, x, y, z, entityPlayer, par6, par7, par8, par9); } - //check for filled fluid containers and see if we can fill up + //check for filled fluid containers and see if we can empty them into our input tank FluidStack fluid = FluidContainerRegistry.getFluidForFilledItem(item); if(fluid == null) { if(item.getItem() == Items.water_bucket) { @@ -56,11 +56,11 @@ public class BlockVat extends AbstractMachineBlock { int filled = vat.fill(ForgeDirection.UP, fluid, false); if(filled >= fluid.amount) { vat.fill(ForgeDirection.UP, fluid, true); + if(!entityPlayer.capabilities.isCreativeMode) { + entityPlayer.inventory.setInventorySlotContents(entityPlayer.inventory.currentItem, Util.consumeItem(item)); + } + return true; } - if(!entityPlayer.capabilities.isCreativeMode) { - entityPlayer.inventory.setInventorySlotContents(entityPlayer.inventory.currentItem, Util.consumeItem(item)); - } - return true; } //now check for empty fluid containers to fill @@ -72,7 +72,7 @@ public class BlockVat extends AbstractMachineBlock { if(filled == null) { //this shouldn't be necessary but it appears to be a bug as the above method doesnt work FluidContainerData[] datas = FluidContainerRegistry.getRegisteredFluidContainerData(); for (FluidContainerData data : datas) { - if(data.fluid.getFluid().getName().equals(available.getFluid().getName())) { + if(data.fluid.getFluid().getName().equals(available.getFluid().getName()) && data.emptyContainer.isItemEqual(item)) { res = data.filledContainer.copy(); filled = FluidContainerRegistry.getFluidForFilledItem(res); } diff --git a/src/main/java/crazypants/enderio/machine/still/GuiVat.java b/src/main/java/crazypants/enderio/machine/still/GuiVat.java index 1320d7c5..d5221844 100644 --- a/src/main/java/crazypants/enderio/machine/still/GuiVat.java +++ b/src/main/java/crazypants/enderio/machine/still/GuiVat.java @@ -1,5 +1,7 @@ package crazypants.enderio.machine.still; +import java.awt.Rectangle; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.IIcon; import net.minecraftforge.fluids.FluidStack; @@ -7,18 +9,55 @@ import net.minecraftforge.fluids.FluidTank; import org.lwjgl.opengl.GL11; +import crazypants.enderio.fluid.Fluids; import crazypants.enderio.machine.GuiMachineBase; import crazypants.enderio.machine.IMachineRecipe.ResultStack; +import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.machine.MachineRecipeInput; +import crazypants.gui.GuiToolTip; import crazypants.render.RenderUtil; +import crazypants.util.Lang; public class GuiVat extends GuiMachineBase { - private final TileVat still; + private static final String GUI_TEXTURE = "enderio:textures/gui/vat.png"; + + private final TileVat vat; public GuiVat(InventoryPlayer inventory, TileVat te) { super(te, new ContainerVat(inventory, te)); - still = te; + vat = te; + + addToolTip(new GuiToolTip(new Rectangle(30, 12, 15, 47), "") { + + @Override + protected void updateText() { + text.clear(); + String heading = Lang.localize("vat.inputTank"); + if(vat.inputTank.getFluid() != null) { + heading += ": " + vat.inputTank.getFluid().getFluid().getLocalizedName(); + } + text.add(heading); + text.add(Fluids.toCapactityString(vat.inputTank)); + } + + }); + + addToolTip(new GuiToolTip(new Rectangle(132,12,15,47), "") { + + @Override + protected void updateText() { + text.clear(); + String heading = Lang.localize("vat.outputTank"); + if(vat.outputTank.getFluid() != null) { + heading += ": " + vat.outputTank.getFluid().getFluid().getLocalizedName(); + } + text.add(heading); + text.add(Fluids.toCapactityString(vat.outputTank)); + } + + }); + } /** @@ -28,41 +67,41 @@ public class GuiVat extends GuiMachineBase { @Override protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - RenderUtil.bindTexture("enderio:textures/gui/still.png"); + RenderUtil.bindTexture(GUI_TEXTURE); int guiLeft = (width - xSize) / 2; int guiTop = (height - ySize) / 2; drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - if(still.getProgress() < 1 && still.getProgress() > 0) { - int scaled = still.getProgressScaled(12); + if(vat.getProgress() < 1 && vat.getProgress() > 0) { + int scaled = vat.getProgressScaled(12); drawTexturedModalRect(guiLeft + 81, guiTop + 76 - scaled, 176, 12 - scaled, 14, scaled + 2); IIcon inputIcon = null; - for (MachineRecipeInput input : still.getCurrentTask().getInputs()) { + for (MachineRecipeInput input : vat.getCurrentTask().getInputs()) { if(input.fluid != null && input.fluid.getFluid() != null) { inputIcon = input.fluid.getFluid().getStillIcon(); break; } } - VatMachineRecipe rec = (VatMachineRecipe) still.getCurrentTask().getRecipe(); + VatMachineRecipe rec = (VatMachineRecipe) vat.getCurrentTask().getRecipe(); IIcon outputIcon = null; - for (ResultStack res : rec.getCompletedResult(1.0f, still.getCurrentTask().getInputs())) { + for (ResultStack res : rec.getCompletedResult(1.0f, vat.getCurrentTask().getInputs())) { if(res.fluid != null && res.fluid.getFluid() != null) { outputIcon = res.fluid.getFluid().getStillIcon(); } } if(inputIcon != null && outputIcon != null) { - renderVat(inputIcon, outputIcon, still.getProgress()); + renderVat(inputIcon, outputIcon, vat.getProgress()); } } RenderUtil.bindBlockTexture(); - renderTank(still.inputTank, 30); - renderTank(still.outputTank, 132); + renderTank(vat.inputTank, 30); + renderTank(vat.outputTank, 132); - RenderUtil.bindTexture("enderio:textures/gui/still.png"); + RenderUtil.bindTexture(GUI_TEXTURE); super.drawGuiContainerBackgroundLayer(par1, par2, par3); } @@ -82,7 +121,7 @@ public class GuiVat extends GuiMachineBase { GL11.glDisable(GL11.GL_BLEND); GL11.glColor4f(1, 1, 1, 1); - RenderUtil.bindTexture("enderio:textures/gui/still.png"); + RenderUtil.bindTexture(GUI_TEXTURE); drawTexturedModalRect(x, y, 0, 256 - 28, 26, 28); }