From ac7f744163feefc1c65bb85de71aed037c46d501 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Thu, 18 Dec 2014 07:51:48 -0500 Subject: [PATCH] Add configurable I/O for buffers. Improve GUI. Improve power logic. --- resources/assets/enderio/lang/en_US.lang | 3 + .../assets/enderio/textures/gui/buffer.png | Bin 262932 -> 262932 bytes .../enderio/textures/gui/buffer_full.png | Bin 0 -> 262932 bytes .../enderio/machine/buffer/BlockBuffer.java | 35 ++-- .../machine/buffer/ContainerBuffer.java | 7 +- .../enderio/machine/buffer/GuiBuffer.java | 175 ++++++++++++++---- .../machine/buffer/PacketBufferIO.java | 45 +++++ .../enderio/machine/buffer/TileBuffer.java | 80 +++++--- .../enderio/machine/capbank/GuiCapBank.java | 19 +- .../machine/power/PowerDisplayUtil.java | 17 ++ 10 files changed, 284 insertions(+), 97 deletions(-) create mode 100644 resources/assets/enderio/textures/gui/buffer_full.png create mode 100644 src/main/java/crazypants/enderio/machine/buffer/PacketBufferIO.java diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 1a29fdba..16a3204d 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -645,6 +645,9 @@ enderio.darksteel.upgrade.solar_two.tooltip.detailed.line1=Generates power from //------GUI +enderio.gui.simple.in=Max In: +enderio.gui.simple.out=Max Out: + enderio.gui.enabled=Enabled enderio.gui.disabled=Disabled enderio.gui.send=Send diff --git a/resources/assets/enderio/textures/gui/buffer.png b/resources/assets/enderio/textures/gui/buffer.png index 1068c5fe580fa79ab7a751a7292d6a4fba2bb6df..7abf0928b7a355af26f0ceeb7ffae58b75bc204f 100644 GIT binary patch delta 2536 zcmc&$ZD+AH6haxx}PR+L90CNTNt`{}TM#Yyb3* z-c@2~NJws-)UmXoq4q~1v<6olK_#9_K$JE`5h-nn;GfdkHWC#@dVOav7rlliHI+Cp zyR$R%KF>2V_q;a)UHU+mo~(4bgTZgFZ5=dghmS!FOrwy$I!1KU=(bj>VE|xT>45c+ zet<&-PW)EV=`;@npqqJ}Znjcg!|&9?YBo_%)v~fOK3Nadvl|oxfz`PNr;%RL#>U1J z>`Tl3sOx~`({2NQqXd#ncT6$e=Vl3Sr=|OT$@E$Y|21M6rBfPxFL~;B77ecu;SO-* zW8ZI@wLLukgK4<=+Cu0QXA5D9Qo3QwA3PO?C>!Zr!b6SFj2KtpAanwV?}E?(A{2o< zBExE$AgQ7fKG_O4Oe4liTi}zdnn%2L8_M!&P850wZF4a$x$xsr*o?CgQ*~P-y(xkaRQ&lCw1C|jO2H5jx8H#m#Q!_?+&~M&c?$kn49`N4&HpTbq`C#**!(g!rz`*{CqDZzKTbt< z>fG-qf0(iziA3zGD9W^phowW_S803e-90=|K@Md+i2go;{@U%M_d;(jVdgo1#&qEs zKelP~uP*Vnj2XsEuqx}k36&$_Dwgyn&@%-DQv&7VX9yKLby5YkY2|!z#X}Ag%jwg)S=?$iS_5n1JyJfar}@;9k)i2kHxO>#U}g*UwqM5oGT!{_*|ZV;v;PX`>$!OuBD}AexU3f(wv%61Y1PHg zf0ZU3M~@L#ZX$5lO2p3*GD^htAZ(KEe{94CaLc=of|8Z~{(dXw52*C`v5mVV-UL<3 z%geFvYa*{HHE{A0X(_;ra-GopybYg<4=dEy?4)E5;G@zhVga@PW`0R<$4|R=U0x^m OpticM>YK{8{eJ`ODBwB( delta 1432 zcmbtUZ%9;G6!+YBU+?9NcCYP+s%9~K#x7C&qt)VWVrW^0S6fj95o z^UnR9-|zg+d;MKTf0xl)rY$o*{bfG;6T32ITV8%(Eku~1rf6+#E%1kNa+!UkZFVY@ zT;Q84VL2}^f^OR~oLPDjbO3naCYnXiV_Q1&XSTLTAfL>8n}K!udga>4{&O)F0jJYH3XT<=^H6WoY&8p; zdBQvf(LCE~!SIacG?*jfd}jef@Tj<30CSYy`zdofPnr;B@t)-h5*0apB4>)dXe*RrZD6gDln&mn*I!z?!|iE=$}sDM;gzhyJ!_ z@Na=NS7l)kp=J~)w5@#J*bh4Y>j{+eO;cdlUm5IT)gP>Sa))jCB|ZLe0FEld!^2LC zKM8Wd!unQux5E|rc*}V8C!6kox*wzrQMev*3Ex!&vUN+Q;PZ0Hp7O$t5M5~S3E;ao zxoQ7e;5^eSBuWmpA5|G@H!mxZW_r;I4}V+&V>J5UbCW+yKntQ}xp}D1B1puj?+fOIBS=JTTs-@l*o(L?S>ydc2w=!WeH4;S|2{PrBl= zzyt5f&I%?8Gbd>W&QQjOUahUI?~8HxKL_TRAH!ZAS7@p`wU!4;$&cwhZr148 zZzeV{JKTef?Cm1Sb-WsYcc;F>QcFfI%UUXx9a z);;=%*Cfepr_=nOS|RdQ8zuUImGp|!oj`QMXp$t3bub z9a0TKKS#DGbi@3c{dD4_78Bf^AG}A#^Js@U7!s#Tm2GaLFjiNH h8D)xS2`E4Oo|`igm~Nd>zLRfvWyPWL8)c1WUIK54$qxVk diff --git a/resources/assets/enderio/textures/gui/buffer_full.png b/resources/assets/enderio/textures/gui/buffer_full.png new file mode 100644 index 0000000000000000000000000000000000000000..5b2c3ec3bc1e976672b8698c8d805ef515f3957e GIT binary patch literal 262932 zcmeI*PlzN}9S87gvzk99E(SfAEV>#4B6v}8hTSMcH!&MX{KF0+QKBLu{>_>RhzDoL zLC^&oy{L%h5RkwGK@oC_9+X);2J~X$KUgmc;vQlmaks74yKgd6*{bQDdfisl`xMMp zS6BDz_ddU_?@sqrzy9V2?|uIb*WGkoQ4}|vyz9h=i(*t>92M8RqFjCKE02AqTwVLX zT_1h0C|>nM_!%7;-*Z_yT=;og{ zLMw5Z#0%C0IxevDy#4X5H&3o9w{Cp-RmI^$<`Jfu^nP8E+o{`kzdue)Iv+j;1rhj#2jzvITFT%Y++vz{^1VA_- zXIa+Q*NfHF)neA$*R|Qjc1pW=%ul-=;?luiS3%czQeb;~JM_!{SP80gsM^NavuCSU z*(T5_f$?};tgWpTTU%Q~pk-w)y!OdtvffGA;2AVUEGkYUjcIRk;O9s0@EjOPOEX#8d44Vw~Shr;D$?J zw}1fHt>H3(%mf5LW(7A~0=oqSz-|qf31lW905U7M;S$&_AOLo2xJ)230RfO%!3}qK z0`L0nx!1Ni7a)oVgD7E5AVUEGkYUjcnLrc}08zr4K!ySWAj6^?GJz-{0HTC7feZ!A z6Oduihcx6*J^i=QEaN$I=7Guj`uZ$4o!%zZ%sgFdrwS18Cgn1{{_NSa)%~^!bWUJA z9#8wUwN=iLT@*6~!1nfbar*S>B2NBs{`~pk+_`g&V>@!>NOAb^;puHcc!cBQ*s)`c z_vzbCF9G^iG5sZQS>UbTf7{^g+Y|CCXk_k0LZZDhD;y|2!JSIO&~)70gz$Q z4Vgd`@F&42VV#{oc*j5YMF8af49Il+@lSo34u5CZ0$_*2g`o?iIzeYhP6A*^)ijny zf#b)IPfzS=yipH!-t+p;{r1Y|0&Gq;+V)=}v=wy!|Es{t%F0ZSA5IahTf(mj;rqH~ zS(+Yio_3lZE3{Mn-mj+Hx7jBE+UU7&Cj`O)(`E_h0H^xGzEtfjD**gmu+1~aeF^kj zKmhc-fVxkhjer1XqvyT^dM+RUdR{=?C(uSf0JPC_UjjWB5CAlp z7X{Xhy=(2%^)vPL0wA@h_LeFTCgzxRmY=$gg@eCq?bP)(_4SPb&@{c$tR0ECv);b$ zcG{_vxpe)IeZr)FO-mSinSy570%9&ZA+6?A_B zJr)oEJuaTE6KE?S0NM(=KY{cDU;ou}n@c+vAa-9ELuz&#QaB*~vz@h~Nz@mkr{+q7B2e{!pnoH-MBwOVVZnU7Di&+g}BxV*NuHvK6N zl1nq(Ec0j?*khR~=zs+c|MQqBs2(q+Pt#06We=7!rB3}&=iKwz`=9-Cx6TEK1K9WF zfLVhg)!wz)e)f7)w^I6;HK?kaZrdAz=`6KGpmzcSpm!zHVFKv{1VB1VEfMIQfB@)S z$#j@NIspNY&QePRdM6+NdRHBT3E_1iLexA z4?>`u0s^3$bQhy&|v_0RgZSW)DK3n*su$n|0AE0!tAP z083%^AOyN8AON~q7rh#Sz{PJoarb`b0(5AcjgtiobzUapYJLWG&8NAy_O=mdoI0pY z!|qF9Q3B)fc-r*V)>c^eZ0evzsT{0bF9#0h=3WE_As_$-QAUFxa4-P@a4~Rhyns2N>~%fP(T1=Sad@s5CsH4l&~g{p@0C$u;_+NAPO|j6A(U= zA3lHHcF|6=AfIL*dlx5Qw&2CtYI#8dotrKAL(ksy`I*iI*qm%E$Rt^_UK1pv)DVIG z2?&7x)l82GBohz-$tX3n41xH1U>T2|b47)lSWGESz}3rv|6II`~w-K)_4Ydarr+coT45F}EjB3Y_@OBmbD`T!0>F34
    LzntKeG{bL)JsOJK78eZoJ5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7e?f&|`u_=yk9elEb~WMe`7&@2H01PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNBUM&P+8AGvw implements IFacade { - + public static BlockBuffer create() { + PacketHandler.INSTANCE.registerMessage(PacketBufferIO.class, PacketBufferIO.class, PacketHandler.nextID(), Side.SERVER); BlockBuffer res = new BlockBuffer(); res.init(); return res; } - + private BlockBuffer() { super(ModObject.blockBuffer, TileBuffer.class); setBlockTextureName("enderio:blockBuffer"); } - + @Override - protected void init() { + protected void init() { GameRegistry.registerBlock(this, BlockItemBuffer.class, modObject.unlocalisedName); GameRegistry.registerTileEntity(teClass, modObject.unlocalisedName + "TileEntity"); EnderIO.guiHandler.registerGuiHandler(getGuiId(), this); MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPainter.unlocalisedName, new PainterTemplate()); } - + @Override public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { TileEntity te = world.getTileEntity(x, y, z); @@ -74,17 +77,17 @@ public class BlockBuffer extends AbstractMachineBlock implements IFa protected String getMachineFrontIconKey(boolean active) { return this.textureName; } - + @Override protected String getBackIconKey(boolean active) { return getMachineFrontIconKey(active); } - + @Override protected String getSideIconKey(boolean active) { return getMachineFrontIconKey(active); } - + @Override public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { TileEntity te = world.getTileEntity(x, y, z); @@ -120,13 +123,13 @@ public class BlockBuffer extends AbstractMachineBlock implements IFa protected boolean shouldDropDefaultItem(World world, EntityPlayer player, int x, int y, int z) { return false; } - + @Override public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { if(!world.isRemote) { TileEntity te = world.getTileEntity(x, y, z); if(te instanceof TileBuffer) { - TileBuffer cb = (TileBuffer) te; + TileBuffer cb = (TileBuffer) te; if(!player.capabilities.isCreativeMode) { dropBlockAsItem(world, x, y, z, createDrop(cb)); } @@ -141,12 +144,12 @@ public class BlockBuffer extends AbstractMachineBlock implements IFa te.writeCommon(stack.stackTagCompound); return stack; } - + public ItemStack createItemStackForSourceBlock(ItemStack machine, Block block, int sourceMeta) { PainterUtil.setSourceBlock(machine, block, sourceMeta); return machine; } - + public final class PainterTemplate extends BasicPainterTemplate { public PainterTemplate() { @@ -167,8 +170,8 @@ public class BlockBuffer extends AbstractMachineBlock implements IFa @Override public int getFacadeMetadata(IBlockAccess world, int x, int y, int z, int side) { TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof TileBuffer) { - return ((TileBuffer)te).getSourceBlockMetadata(); + if(te instanceof TileBuffer) { + return ((TileBuffer) te).getSourceBlockMetadata(); } return 0; } @@ -176,8 +179,8 @@ public class BlockBuffer extends AbstractMachineBlock implements IFa @Override public Block getFacade(IBlockAccess world, int x, int y, int z, int side) { TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof TileBuffer) { - return ((TileBuffer)te).getSourceBlock(); + if(te instanceof TileBuffer) { + return ((TileBuffer) te).getSourceBlock(); } return this; } diff --git a/src/main/java/crazypants/enderio/machine/buffer/ContainerBuffer.java b/src/main/java/crazypants/enderio/machine/buffer/ContainerBuffer.java index 15ca18c5..a317c5b8 100644 --- a/src/main/java/crazypants/enderio/machine/buffer/ContainerBuffer.java +++ b/src/main/java/crazypants/enderio/machine/buffer/ContainerBuffer.java @@ -14,8 +14,9 @@ public class ContainerBuffer extends AbstractMachineContainer { @Override protected void addMachineSlots(InventoryPlayer playerInv) { - if(((TileBuffer)tileEntity).hasInventory()) { - Point point = new Point(62, 15); + TileBuffer buf = (TileBuffer) tileEntity; + if(buf.hasInventory()) { + Point point = new Point(buf.hasInventory() && buf.hasPower() ? 96 : 62, 15); for (int i = 0; i < 9; i++) { addSlotToContainer(new Slot(this.tileEntity, i, point.x + ((i % 3) * 18), point.y + ((i / 3) * 18))); } @@ -24,6 +25,6 @@ public class ContainerBuffer extends AbstractMachineContainer { @Override public Point getPlayerInventoryOffset() { - return new Point(8, 96); + return super.getPlayerInventoryOffset(); } } diff --git a/src/main/java/crazypants/enderio/machine/buffer/GuiBuffer.java b/src/main/java/crazypants/enderio/machine/buffer/GuiBuffer.java index 42904216..12d1a727 100644 --- a/src/main/java/crazypants/enderio/machine/buffer/GuiBuffer.java +++ b/src/main/java/crazypants/enderio/machine/buffer/GuiBuffer.java @@ -1,5 +1,6 @@ package crazypants.enderio.machine.buffer; +import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; @@ -7,104 +8,214 @@ import org.lwjgl.opengl.GL11; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; +import crazypants.enderio.machine.power.PowerDisplayUtil; +import crazypants.enderio.network.PacketHandler; import crazypants.render.RenderUtil; import crazypants.util.Lang; public class GuiBuffer extends GuiPoweredMachineBase { - + + private static final String TEXTURE_SIMPLE = "enderio:textures/gui/buffer.png"; + private static final String TEXTURE_FULL = "enderio:textures/gui/buffer_full.png"; + + private GuiTextField maxInput; + private GuiTextField maxOutput; + + private int lastInput, lastOutput; + public GuiBuffer(InventoryPlayer par1InventoryPlayer, TileBuffer te) { super(te, new ContainerBuffer(par1InventoryPlayer, te)); - redstoneButton.setPosition(116, 24); - configB.setPosition(116, 42); + redstoneButton.setPosition(isFull() ? 153 : 120, 24); + configB.setPosition(isFull() ? 153 : 120, 42); } - + + @Override + public void initGui() { + super.initGui(); + + int x = guiLeft + (isFull() ? 20 : 58); + int y = guiTop + 27; + maxInput = new GuiTextField(getFontRenderer(), x, y, 60, 12); + maxInput.setCanLoseFocus(true); + maxInput.setMaxStringLength(10); + maxInput.setFocused(false); + maxInput.setText(PowerDisplayUtil.formatPower(getTileEntity().getMaxInput())); + + y += 28; + maxOutput = new GuiTextField(getFontRenderer(), x, y, 60, 12); + maxOutput.setCanLoseFocus(true); + maxOutput.setMaxStringLength(10); + maxOutput.setFocused(getTileEntity().hasPower()); + maxOutput.setText(PowerDisplayUtil.formatPower(getTileEntity().getMaxOutput())); + } + + @Override + protected void keyTyped(char par1, int par2) { + super.keyTyped(par1, par2); + if(par1 == 'e') { + super.keyTyped(par1, 1); + } + + if(getTileEntity().hasPower()) { + maxInput.textboxKeyTyped(par1, par2); + maxOutput.textboxKeyTyped(par1, par2); + updateInputOutput(); + } + } + + private void updateInputOutput() { + int input = PowerDisplayUtil.parsePower(maxInput); + setMaxInput(input); + int output = PowerDisplayUtil.parsePower(maxOutput); + setMaxOutput(output); + sendUpdateToServer(); + } + + private void setMaxOutput(int output) { + if(output != lastOutput) { + lastOutput = output; + maxOutput.setText(PowerDisplayUtil.formatPower(output)); + } + } + + private void setMaxInput(int input) { + if(input != lastInput) { + lastInput = input; + maxInput.setText(PowerDisplayUtil.formatPower(input)); + sendUpdateToServer(); + } + } + + protected void sendUpdateToServer() { + PacketHandler.INSTANCE.sendToServer(new PacketBufferIO(getTileEntity(), lastInput, lastOutput)); + } + + @Override + protected void mouseClicked(int par1, int par2, int par3) { + super.mouseClicked(par1, par2, par3); + if(getTileEntity().hasPower()) { + maxInput.mouseClicked(par1, par2, par3); + maxOutput.mouseClicked(par1, par2, par3); + } + } + + @Override + public void updateScreen() { + if(getTileEntity().hasPower()) { + maxInput.updateCursorCounter(); + maxOutput.updateCursorCounter(); + } + } + @Override protected boolean showRecipeButton() { return false; } - + @Override protected boolean renderPowerBar() { return getTileEntity().hasPower(); } - + @Override public int getYSize() { - return ySize + 12; + return ySize; } - + @Override protected int getPowerHeight() { - return 52; + return 52; } - + @Override protected int getPowerX() { - return 48; + return isFull() ? 6 : 44; } - + @Override protected int getPowerY() { return 15; } - + @Override protected int getPowerV() { return 0; } - + @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/buffer.png"); + + RenderUtil.bindTexture(isFull() ? TEXTURE_FULL : TEXTURE_SIMPLE); int sx = (width - xSize) / 2; int sy = (height - ySize) / 2; drawTexturedModalRect(sx, sy, 0, 0, xSize, ySize); - - if (getTileEntity().hasPower()) { + + RenderUtil.bindTexture(TEXTURE_SIMPLE); + + if(getTileEntity().hasPower()) { drawPowerBg(sx, sy); } - - if (getTileEntity().hasInventory()) { + + if(getTileEntity().hasInventory()) { drawSlotBg(sx, sy); } - + + super.drawGuiContainerBackgroundLayer(par1, par2, par3); + String invName = Lang.localize(getTileEntity().getInventoryName() + ".name", false); getFontRenderer().drawStringWithShadow(invName, sx + (xSize / 2) - (getFontRenderer().getStringWidth(invName) / 2), sy + 4, 0xFFFFFF); - RenderUtil.bindTexture("enderio:textures/gui/buffer.png"); - super.drawGuiContainerBackgroundLayer(par1, par2, par3); + + if(getTileEntity().hasPower()) { + sx += isFull() ? 19 : 57; + sy += 17; + + getFontRenderer().drawStringWithShadow(Lang.localize("gui.simple.in"), sx, sy, 0xFFFFFF); + getFontRenderer().drawStringWithShadow(Lang.localize("gui.simple.out"), sx, sy + 27, 0xFFFFFF); + + maxInput.drawTextBox(); + maxOutput.drawTextBox(); + } + } + + boolean isFull() { + return getTileEntity().hasInventory() && getTileEntity().hasPower(); } public void renderSlotHighlights(IoMode mode) { - for (int slot = 0; slot <= getTileEntity().getSizeInventory(); slot++) { + if (!getTileEntity().hasInventory()) { + return; + } + + for (int slot = 0; slot < getTileEntity().getSizeInventory(); slot++) { renderSlotHighlight(slot, mode); } } - + protected void renderSlotHighlight(int slot, IoMode mode) { Slot invSlot = (Slot) inventorySlots.inventorySlots.get(slot); - if (mode == IoMode.PULL) { + if(mode == IoMode.PULL) { renderSlotHighlight(slot, PULL_COLOR); - } else if (mode == IoMode.PUSH) { + } else if(mode == IoMode.PUSH) { renderSlotHighlight(slot, PUSH_COLOR); - } else if (mode == IoMode.PUSH_PULL) { + } else if(mode == IoMode.PUSH_PULL) { renderSplitHighlight(invSlot.xDisplayPosition, invSlot.yDisplayPosition, 16, 16); } } - + protected void renderSplitHighlight(int x, int y, int width, int height) { GL11.glEnable(GL11.GL_BLEND); RenderUtil.renderQuad2D(getGuiLeft() + x, getGuiTop() + y, 0, width, height / 2, PULL_COLOR); RenderUtil.renderQuad2D(getGuiLeft() + x, getGuiTop() + y + (height / 2), 0, width, height / 2, PUSH_COLOR); GL11.glDisable(GL11.GL_BLEND); } - + private void drawPowerBg(int sx, int sy) { - drawTexturedModalRect(sx + 47, sy + 14, xSize + 10, 0, 12, 54); + drawTexturedModalRect(sx + (isFull() ? 5 : 43), sy + 14, xSize + 10, 0, 12, 54); } - + private void drawSlotBg(int sx, int sy) { - drawTexturedModalRect(sx + 61, sy + 14, xSize + 22, 0, 54, 54); + drawTexturedModalRect(sx + (isFull() ? 95 : 61), sy + 14, xSize + 22, 0, 54, 54); } } diff --git a/src/main/java/crazypants/enderio/machine/buffer/PacketBufferIO.java b/src/main/java/crazypants/enderio/machine/buffer/PacketBufferIO.java new file mode 100644 index 00000000..ed66f0e2 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/buffer/PacketBufferIO.java @@ -0,0 +1,45 @@ +package crazypants.enderio.machine.buffer; + +import io.netty.buffer.ByteBuf; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import crazypants.enderio.network.MessageTileEntity; + +public class PacketBufferIO extends MessageTileEntity implements IMessage, IMessageHandler { + + public PacketBufferIO() {} + + private int in, out; + + public PacketBufferIO(TileBuffer tile, int in, int out) { + super(tile); + tile.setIO(in, out); + this.in = in; + this.out = out; + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + this.in = buf.readInt(); + this.out = buf.readInt(); + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeInt(this.in); + buf.writeInt(this.out); + } + + @Override + public IMessage onMessage(PacketBufferIO message, MessageContext ctx) { + TileBuffer buf = message.getTileEntity(message.getWorld(ctx)); + if (buf != null) { + buf.setIO(message.in, message.out); + } + return null; + } + +} diff --git a/src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java b/src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java index f802a8df..cd82c746 100644 --- a/src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java +++ b/src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java @@ -11,20 +11,22 @@ import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.machine.painter.IPaintableTileEntity; import crazypants.enderio.machine.painter.PainterUtil; +import crazypants.enderio.power.IInternalPowerHandler; import crazypants.enderio.power.PowerDistributor; import crazypants.util.BlockCoord; -public class TileBuffer extends AbstractPowerConsumerEntity implements IPaintableTileEntity { +public class TileBuffer extends AbstractPowerConsumerEntity implements IPaintableTileEntity, IInternalPowerHandler { private Block sourceBlock; private int sourceBlockMetadata; - + private boolean hasPower, hasInventory, isCreative; - + private PowerDistributor dist; - - private final int maxOut = Config.powerConduitTierThreeRF; - + + private int maxOut = Config.powerConduitTierThreeRF; + private int maxIn = maxOut; + public TileBuffer() { super(new SlotDefinition(9, 0, 0)); } @@ -51,50 +53,55 @@ public class TileBuffer extends AbstractPowerConsumerEntity implements IPaintabl @Override protected boolean processTasks(boolean redstoneCheckPassed) { - if (getEnergyStored() <= 0) { + if(getEnergyStored() <= 0) { return false; } - if (dist == null) { + if(dist == null) { dist = new PowerDistributor(new BlockCoord(this)); } - int transmitted = dist.transmitEnergy(worldObj, Math.min(maxOut, getEnergyStored())); - setEnergyStored(getEnergyStored() - transmitted); + int transmitted = dist.transmitEnergy(worldObj, Math.min(getMaxOutput(), getEnergyStored())); + setEnergyStored(getEnergyStored() - transmitted); return transmitted > 0; } - + @Override public void setIoMode(ForgeDirection faceHit, IoMode mode) { super.setIoMode(faceHit, mode); - if (dist != null) { + if(dist != null) { dist.neighboursChanged(); } } - + @Override public boolean canInsertItem(int slot, ItemStack var2, int side) { - return hasInventory() && super.canInsertItem(slot, var2, side) && getIoMode(ForgeDirection.VALID_DIRECTIONS[side]).canRecieveInput(); + return hasInventory() && super.canInsertItem(slot, var2, side) && getIoMode(ForgeDirection.VALID_DIRECTIONS[side]).canRecieveInput(); } @Override public boolean canExtractItem(int slot, ItemStack itemstack, int side) { return hasInventory() && super.canExtractItem(slot, itemstack, side) && getIoMode(ForgeDirection.VALID_DIRECTIONS[side]).canOutput(); } - + @Override public boolean canConnectEnergy(ForgeDirection from) { return hasPower; } - + @Override public int getMaxEnergyRecieved(ForgeDirection dir) { - return maxOut; + return maxIn; + } + + @Override + public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { + return hasPower() && getIoMode(from).canRecieveInput() ? super.receiveEnergy(from, maxReceive, isCreative() || simulate) : 0; } @Override - public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { - return hasPower() ? super.receiveEnergy(from, maxReceive, isCreative() || simulate) : 0; + public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { + return 0; } - + @Override protected boolean doPull(ForgeDirection dir) { ItemStack[] invCopy = new ItemStack[inventory.length]; @@ -122,7 +129,7 @@ public class TileBuffer extends AbstractPowerConsumerEntity implements IPaintabl for (int i = 0; i < inventory.length; i++) { invCopy[i] = inventory[i] == null ? null : inventory[i].copy(); } - + BlockCoord loc = getLocation().getLocation(dir); TileEntity te = worldObj.getTileEntity(loc.x, loc.y, loc.z); @@ -134,7 +141,7 @@ public class TileBuffer extends AbstractPowerConsumerEntity implements IPaintabl return ret; } - + @Override public void writeCustomNBT(NBTTagCompound nbtRoot) { super.writeCustomNBT(nbtRoot); @@ -142,13 +149,13 @@ public class TileBuffer extends AbstractPowerConsumerEntity implements IPaintabl nbtRoot.setBoolean("hasPower", hasPower); nbtRoot.setBoolean("creative", isCreative); } - + @Override public void writeCommon(NBTTagCompound nbtRoot) { super.writeCommon(nbtRoot); PainterUtil.setSourceBlock(nbtRoot, sourceBlock, sourceBlockMetadata); } - + @Override public void readCustomNBT(NBTTagCompound nbtRoot) { super.readCustomNBT(nbtRoot); @@ -156,7 +163,7 @@ public class TileBuffer extends AbstractPowerConsumerEntity implements IPaintabl this.hasPower = nbtRoot.getBoolean("hasPower"); this.isCreative = nbtRoot.getBoolean("creative"); } - + @Override public void readCommon(NBTTagCompound nbtRoot) { super.readCommon(nbtRoot); @@ -187,25 +194,38 @@ public class TileBuffer extends AbstractPowerConsumerEntity implements IPaintabl public boolean hasInventory() { return hasInventory; } - + public void setHasInventory(boolean hasInventory) { this.hasInventory = hasInventory; } - + @Override public boolean hasPower() { return hasPower; } - + public void setHasPower(boolean hasPower) { this.hasPower = hasPower; } - - public boolean isCreative() { + + public boolean isCreative() { return isCreative; } public void setCreative(boolean isCreative) { this.isCreative = isCreative; } + + public void setIO(int in, int out) { + this.maxIn = in; + this.maxOut = out; + } + + public int getMaxInput() { + return maxIn; + } + + public int getMaxOutput() { + return maxOut; + } } diff --git a/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java index 0c7df9c0..f323db99 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java @@ -25,8 +25,8 @@ import crazypants.enderio.machine.capbank.network.CapBankClientNetwork; import crazypants.enderio.machine.capbank.network.NetworkState; import crazypants.enderio.machine.capbank.packet.PacketGuiChange; import crazypants.enderio.machine.capbank.packet.PacketNetworkStateRequest; -import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.machine.gui.GuiOverlayIoConfig; +import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; import crazypants.gui.GuiContainerBase; @@ -232,11 +232,11 @@ public class GuiCapBank extends GuiContainerBase { } private void updateInputOutput() { - int input = parsePower(maxInputTF); + int input = PowerDisplayUtil.parsePower(maxInputTF); if(input >= 0 && network.getMaxInput() != input) { setMaxInput(input); } - int output = parsePower(maxOutputTF); + int output = PowerDisplayUtil.parsePower(maxOutputTF); if(output >= 0 && network.getMaxOutput() != output) { setMaxOutput(output); } @@ -264,19 +264,6 @@ public class GuiCapBank extends GuiContainerBase { } } - private int parsePower(GuiTextField tf) { - String txt = tf.getText(); - try { - Integer power = PowerDisplayUtil.parsePower(txt); - if(power == null) { - return -1; - } - return power.intValue(); - } catch (Exception e) { - return -1; - } - } - @Override protected void mouseClicked(int par1, int par2, int par3) { super.mouseClicked(par1, par2, par3); diff --git a/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java b/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java index 6b83a5ab..8c60760b 100644 --- a/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java +++ b/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java @@ -4,8 +4,11 @@ import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; import java.text.NumberFormat; +import net.minecraft.client.gui.GuiTextField; import net.minecraft.item.ItemStack; import cofh.api.energy.IEnergyContainerItem; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import crazypants.util.Lang; public class PowerDisplayUtil { @@ -105,5 +108,19 @@ public class PowerDisplayUtil { public static String abrevation() { return Lang.localize("power.rf"); } + + @SideOnly(Side.CLIENT) + public static int parsePower(GuiTextField tf) { + String txt = tf.getText(); + try { + Integer power = PowerDisplayUtil.parsePower(txt); + if(power == null) { + return -1; + } + return power.intValue(); + } catch (Exception e) { + return -1; + } + } }