diff --git a/src/main/java/crazypants/enderio/machine/still/BlockVat.java b/src/main/java/crazypants/enderio/machine/still/BlockVat.java index 17265fad..0e23c252 100644 --- a/src/main/java/crazypants/enderio/machine/still/BlockVat.java +++ b/src/main/java/crazypants/enderio/machine/still/BlockVat.java @@ -31,7 +31,7 @@ public class BlockVat extends AbstractMachineBlock { public static BlockVat create() { PacketHandler.INSTANCE.registerMessage(PacketTanks.class,PacketTanks.class,PacketHandler.nextID(), Side.CLIENT); - PacketHandler.INSTANCE.registerMessage(PacketTanks.class,PacketTanks.class,PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage(PacketDumpTank.class,PacketDumpTank.class,PacketHandler.nextID(), Side.SERVER); BlockVat res = new BlockVat(); res.init(); return res; diff --git a/src/main/java/crazypants/enderio/machine/still/GuiVat.java b/src/main/java/crazypants/enderio/machine/still/GuiVat.java index 958878bd..eb74a25c 100644 --- a/src/main/java/crazypants/enderio/machine/still/GuiVat.java +++ b/src/main/java/crazypants/enderio/machine/still/GuiVat.java @@ -203,13 +203,7 @@ public class GuiVat extends GuiMachineBase { } private void dump(int i) { - if (i == 1) { - vat.inputTank.setFluid(null); - } else if (i == 2) { - vat.outputTank.setFluid(null); - } - - PacketHandler.INSTANCE.sendToServer(new PacketTanks(vat)); + PacketHandler.INSTANCE.sendToServer(new PacketDumpTank(vat, i)); } @Override diff --git a/src/main/java/crazypants/enderio/machine/still/PacketDumpTank.java b/src/main/java/crazypants/enderio/machine/still/PacketDumpTank.java new file mode 100644 index 00000000..93432370 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/still/PacketDumpTank.java @@ -0,0 +1,53 @@ +package crazypants.enderio.machine.still; + +import io.netty.buffer.ByteBuf; +import net.minecraftforge.fluids.FluidTank; +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 PacketDumpTank extends MessageTileEntity implements IMessageHandler { + + private int tank; + + public PacketDumpTank() { + super(); + } + + public PacketDumpTank(TileVat te, int tank) { + super(te); + this.tank = tank; + getTank(te).setFluid(null); + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeInt(tank); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + tank = buf.readInt(); + } + + private FluidTank getTank(TileVat te) { + if (tank == 1) { + return te.inputTank; + } else if (tank == 2) { + return te.outputTank; + } + return null; + } + + @Override + public IMessage onMessage(PacketDumpTank message, MessageContext ctx) { + TileVat te = message.getTileEntity(ctx.getServerHandler().playerEntity.worldObj); + if (te != null) { + message.getTank(te).setFluid(null); + } + return null; + } +}