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

Optimized pipe packets

Browse source
This commit is contained in:
Calclavia 2014-02-24 20:25:30 +08:00
parent 2b5b496e56
commit 1ab181ff3f
3 changed files with 30 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/PartPipe.java
View file

@ -37,6 +37,7 @@ public class PartPipe extends PartFramedConnection<EnumPipeMaterial, IFluidPipe,
{
protected FluidTank tank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME);
private int pressure;
private boolean markPacket = true;
public PartPipe()
{
@ -60,9 +61,11 @@ public class PartPipe extends PartFramedConnection<EnumPipeMaterial, IFluidPipe,
{
super.update();
if (!world().isRemote)
if (ticks % 20 == 0)
sendFluidUpdate();
if (!world().isRemote && markPacket && ticks % 10 == 0)
{
sendFluidUpdate();
markPacket = false;
}
}
public void sendFluidUpdate()
@ -70,6 +73,7 @@ public class PartPipe extends PartFramedConnection<EnumPipeMaterial, IFluidPipe,
NBTTagCompound nbt = new NBTTagCompound();
tank.writeToNBT(nbt);
tile().getWriteStream(this).writeByte(1).writeNBTTagCompound(nbt);
}
@Override
@ -77,7 +81,8 @@ public class PartPipe extends PartFramedConnection<EnumPipeMaterial, IFluidPipe,
{
if (packetID == 1)
{
this.tank.readFromNBT(packet.readNBTTagCompound());
tank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME);
tank.readFromNBT(packet.readNBTTagCompound());
}
else
{
@ -119,19 +124,28 @@ public class PartPipe extends PartFramedConnection<EnumPipeMaterial, IFluidPipe,
@Override
public int fill(ForgeDirection from, FluidStack resource, boolean doFill)
{
return tank.fill(resource, doFill);
markPacket = true;
if (!world().isRemote)
return tank.fill(resource, doFill);
return pressure;
}
@Override
public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain)
{
return tank.drain(resource.amount, doDrain);
markPacket = true;
if (!world().isRemote)
return tank.drain(resource.amount, doDrain);
return null;
}
@Override
public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain)
{
return tank.drain(maxDrain, doDrain);
markPacket = true;
if (!world().isRemote)
return tank.drain(maxDrain, doDrain);
return null;
}
@Override
@ -149,7 +163,7 @@ public class PartPipe extends PartFramedConnection<EnumPipeMaterial, IFluidPipe,
@Override
public FluidTankInfo[] getTankInfo(ForgeDirection from)
{
return this.getNetwork().getTankInfo();
return new FluidTankInfo[] { tank.getInfo() };
}
@Override
@ -164,6 +178,7 @@ public class PartPipe extends PartFramedConnection<EnumPipeMaterial, IFluidPipe,
{
this.tank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME);
}
return this.tank;
}
@ -198,7 +213,7 @@ public class PartPipe extends PartFramedConnection<EnumPipeMaterial, IFluidPipe,
@Override
public int getMaxFlowRate()
{
return 50;
return 100;
}
@Override

2
mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/TilePump.java
View file

@ -13,7 +13,7 @@ import calclavia.lib.prefab.tile.IRotatable;
public class TilePump extends TileMechanical implements IFluidHandler, IRotatable, IPressure
{
public long maximumPower = 10000;
private final long maximumPower = 10000;
@Override
public int fill(ForgeDirection from, FluidStack resource, boolean doFill)

9
src/main/java/resonantinduction/core/prefab/fluid/PipeNetwork.java
View file

@ -165,8 +165,9 @@ public class PipeNetwork extends FluidNetwork
/**
* Move fluid from higher pressure to lower. In this case, move from tankA to tankB.
*/
int pressureA = sourcePipe.getPressure(ForgeDirection.getOrientation(i));
int pressureB = otherPipe.getPressure(ForgeDirection.getOrientation(i).getOpposite());
ForgeDirection dir = ForgeDirection.getOrientation(i);
int pressureA = sourcePipe.getPressure(dir);
int pressureB = otherPipe.getPressure(dir.getOpposite());
if (pressureA >= pressureB)
{
@ -190,8 +191,8 @@ public class PipeNetwork extends FluidNetwork
if (quantity > 0)
{
tankA.drain(quantity, true);
tankB.fill(new FluidStack(fluidA.getFluid(), quantity), true);
sourcePipe.drain(dir.getOpposite(), quantity, true);
otherPipe.fill(dir, new FluidStack(fluidA.getFluid(), quantity), true);
}
}
}