Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/calclavia/resonant-induction

Browse source
This commit is contained in:
Calclavia 2014-01-15 21:31:36 +08:00
parent a87e21103c 29d9f58213
commit 11aa32154c
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/resonantinduction/mechanical/fluid/pipe/PipeNetwork.java
View file

@ -29,8 +29,8 @@ public class PipeNetwork extends FluidNetwork
public void update()
{
super.update();
//Slight delay to allow visual effect to take place before draining the pipe tanks
if (this.ticks % 2 == 0 && this.getTank().getFluid() != null)
//Slight delay to allow visual effect to take place before draining the pipe's internal tank
if (this.ticks % 2 == 0 && this.getTank().getFluidAmount() > 0)
{
FluidStack stack = this.getTank().getFluid().copy();
int count = this.connectionMap.size();

4
src/main/java/resonantinduction/mechanical/fluid/tank/TankNetwork.java
View file

@ -8,7 +8,6 @@ import net.minecraftforge.fluids.FluidStack;
import resonantinduction.api.fluid.IFluidPart;
import resonantinduction.mechanical.fluid.network.FluidNetwork;
import universalelectricity.core.net.NetworkTickHandler;
import calclavia.lib.utility.FluidUtility;
/** Network that handles connected tanks
*
@ -23,13 +22,11 @@ public class TankNetwork extends FluidNetwork
@Override
public void reloadTanks()
{
System.out.println("TankNetwork: Balancing fluid");
FluidStack fillStack = this.getTank().getFluid();
int lowestY = 255, highestY = 0;
if (fillStack == null || fillStack.getFluid().isGaseous())
{
System.out.println("TankNetwork: Stack is null or a gas");
super.reloadTanks();
}
else if (this.getConnectors().size() > 0)
@ -62,7 +59,6 @@ public class TankNetwork extends FluidNetwork
}
if (!parts.isEmpty())
{
System.out.println("TankNetwork: balancing level: " + y);
this.fillTankSet(fillStack, parts);
}