tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Beat packet usage down

Browse source
This commit is contained in:
DarkGuardsman 2013-11-03 01:20:03 -04:00
parent 6636b47004
commit 27567fe18c
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/dark/fluid/common/prefab/TileEntityFluidNetworkTile.java
View file

@ -40,7 +40,7 @@ import dark.fluid.common.FluidPartsMaterial;
public abstract class TileEntityFluidNetworkTile extends TileEntityFluidDevice implements INetworkFluidPart, ISimplePacketReceiver public abstract class TileEntityFluidNetworkTile extends TileEntityFluidDevice implements INetworkFluidPart, ISimplePacketReceiver
{ {
private int updateTick = 1; private int updateTick = 1;
public static int refreshRate = 20; public static int refreshRate = 40;
protected FluidTank tank; protected FluidTank tank;
protected FluidTankInfo[] internalTanksInfo = new FluidTankInfo[1]; protected FluidTankInfo[] internalTanksInfo = new FluidTankInfo[1];
protected List<TileEntity> connectedBlocks = new ArrayList<TileEntity>(); protected List<TileEntity> connectedBlocks = new ArrayList<TileEntity>();
@ -51,6 +51,7 @@ public abstract class TileEntityFluidNetworkTile extends TileEntityFluidDevice i
protected int damage = 0, maxDamage = 1000; protected int damage = 0, maxDamage = 1000;
protected int subID = 0; protected int subID = 0;
protected int tankCap; protected int tankCap;
protected FluidStack prevStack = null;
protected NetworkFluidTiles network; protected NetworkFluidTiles network;
@ -91,10 +92,18 @@ public abstract class TileEntityFluidNetworkTile extends TileEntityFluidDevice i
this.updateTick = this.worldObj.rand.nextInt(5) * 40 + 20; this.updateTick = this.worldObj.rand.nextInt(5) * 40 + 20;
this.refresh(); this.refresh();
} }
if (ticks % this.refreshRate == 0) if (ticks % TileEntityFluidNetworkTile.refreshRate == 0)
{ {
this.updateTank = false; this.updateTank = false;
this.sendTankUpdate(0); if (this.getTank().getFluid() == null && this.prevStack == null)
{
//Do nothing
}
else if ((this.getTank().getFluid() == null && this.prevStack != null) || (this.getTank().getFluid() != null && this.prevStack == null) || (this.getTank().getFluid().amount != this.prevStack.amount))
{
this.sendTankUpdate(0);
}
this.prevStack = this.tank.getFluid();
} }
} }
} }
@ -250,7 +259,7 @@ public abstract class TileEntityFluidNetworkTile extends TileEntityFluidDevice i
{ {
int p = this.getTank().getFluid() != null ? this.getTank().getFluid().amount : 0; int p = this.getTank().getFluid() != null ? this.getTank().getFluid().amount : 0;
int fill = this.getTank().fill(stack, doFill); int fill = this.getTank().fill(stack, doFill);
if (p != fill) if (p != fill && doFill)
{ {
//TODO add a catch to this so we don't send a dozen packets for one updates //TODO add a catch to this so we don't send a dozen packets for one updates
if (update) if (update)
@ -271,7 +280,7 @@ public abstract class TileEntityFluidNetworkTile extends TileEntityFluidDevice i
{ {
FluidStack prev = this.getTank().getFluid(); FluidStack prev = this.getTank().getFluid();
FluidStack stack = this.getTank().drain(volume, doDrain); FluidStack stack = this.getTank().drain(volume, doDrain);
if (prev != null && (stack == null || prev.amount != stack.amount)) if (prev != null && (stack == null || prev.amount != stack.amount) && doDrain)
{ {
if (update) if (update)
{ {