From 8b4afcac8c9760a510960e51892c6377e05c86c1 Mon Sep 17 00:00:00 2001
From: Calclavia <admin@calclavia.com>
Date: Sun, 23 Feb 2014 21:59:52 +0800
Subject: [PATCH] Added pump and new pressure fluid system

---
 .../archaic/channel/TileChannel.java          |  15 +-
 build.gradle                                  |   2 +-
 .../mechanical/Mechanical.java                |   4 +
 .../mechanical/fluid/pipe/PartPipe.java       |  70 ++------
 .../mechanical/fluid/tank/TankNetwork.java    |   9 -
 ...BlockHydrualicPump.java => BlockPump.java} |   6 +-
 .../fluid/transport/RenderPump.java           |  34 ++++
 .../{TileHydraulicPump.java => TilePump.java} |  67 ++++----
 .../api/mechanical/fluid/IFluidNetwork.java   |   3 -
 .../api/mechanical/fluid/IFluidPipe.java      |  11 +-
 .../api/mechanical/fluid/IPressure.java       |  10 ++
 .../api/mechanical/fluid/IPressureInput.java  |   2 +-
 .../core/prefab/fluid/PipeNetwork.java        | 158 ++++++++++++++++--
 src/main/models/Archive/Pump.tcn              | Bin 1783 -> 3158 bytes
 .../assets/resonantinduction/models/pump.tcn} | Bin
 15 files changed, 251 insertions(+), 140 deletions(-)
 rename mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/{BlockHydrualicPump.java => BlockPump.java} (87%)
 create mode 100644 mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/RenderPump.java
 rename mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/{TileHydraulicPump.java => TilePump.java} (56%)
 create mode 100644 src/main/java/resonantinduction/api/mechanical/fluid/IPressure.java
 rename src/main/{models/Archive/BasicPump.tcn => resources/assets/resonantinduction/models/pump.tcn} (100%)

diff --git a/archaic/src/main/java/resonantinduction/archaic/channel/TileChannel.java b/archaic/src/main/java/resonantinduction/archaic/channel/TileChannel.java
index 43c2b2933..dc7727291 100644
--- a/archaic/src/main/java/resonantinduction/archaic/channel/TileChannel.java
+++ b/archaic/src/main/java/resonantinduction/archaic/channel/TileChannel.java
@@ -135,25 +135,24 @@ public class TileChannel extends TileFluidNetwork implements IBlockActivate, IFl
 	@Override
 	public void onWrongPressure(ForgeDirection side, int pressure)
 	{
-		// TODO place fluid blocks into the world
 
 	}
 
 	@Override
-	public int getMaxPressure()
+	public int getPressure(ForgeDirection dir)
 	{
 		return 0;
 	}
 
-	@Override
-	public int getPressure()
-	{
-		return this.getNetwork().getPressure();
-	}
-
 	@Override
 	public int getMaxFlowRate()
 	{
 		return 500;
 	}
+
+	@Override
+	public void setPressure(int amount)
+	{
+
+	}
 }
diff --git a/build.gradle b/build.gradle
index c9026e9d9..ae8c21c48 100644
--- a/build.gradle
+++ b/build.gradle
@@ -95,7 +95,7 @@ dependencies {
 	compile group: 'calclaviacore', name: 'calclavia-core', version: "${config.version.calclaviacore}", classifier: "dev"
 	compile name: 'CodeChickenLib', version: "${config.version.minecraft}-${config.version.cclib}", ext: 'jar'
 	compile name: 'ForgeMultipart', version: "${config.version.minecraft}-${config.version.fmp}", ext: 'jar'
-	compile name: 'NotEnoughItems', version: "${config.version.nei}", type: 'jar'
+	compile name: 'NotEnoughItems', version: "${config.version.nei}", ext: 'jar'
 }
 
 publishing {
diff --git a/mechanical/src/main/java/resonantinduction/mechanical/Mechanical.java b/mechanical/src/main/java/resonantinduction/mechanical/Mechanical.java
index a9be50216..3aa387f3c 100644
--- a/mechanical/src/main/java/resonantinduction/mechanical/Mechanical.java
+++ b/mechanical/src/main/java/resonantinduction/mechanical/Mechanical.java
@@ -18,7 +18,9 @@ import resonantinduction.mechanical.fluid.pipe.ItemPipe;
 import resonantinduction.mechanical.fluid.tank.BlockTank;
 import resonantinduction.mechanical.fluid.tank.TileTank;
 import resonantinduction.mechanical.fluid.transport.BlockGrate;
+import resonantinduction.mechanical.fluid.transport.BlockPump;
 import resonantinduction.mechanical.fluid.transport.TileGrate;
+import resonantinduction.mechanical.fluid.transport.TilePump;
 import resonantinduction.mechanical.gear.ItemGear;
 import resonantinduction.mechanical.gear.ItemGearShaft;
 import resonantinduction.mechanical.item.ItemPipeGauge;
@@ -94,6 +96,7 @@ public class Mechanical
 	public static Block blockTank;
 	public static Block blockReleaseValve;
 	public static Block blockGrate;
+	public static Block blockPump;
 
 	public static Item itemPipe;
 	public static Item itemPipeGuage;
@@ -124,6 +127,7 @@ public class Mechanical
 
 		blockTank = contentRegistry.createBlock(BlockTank.class, ItemBlockFluidContainer.class, TileTank.class);
 		blockGrate = contentRegistry.createTile(BlockGrate.class, TileGrate.class);
+		blockPump = contentRegistry.createTile(BlockPump.class, TilePump.class);
 
 		itemPipeGuage = contentRegistry.createItem(ItemPipeGauge.class);
 		itemPipe = contentRegistry.createItem(ItemPipe.class);
diff --git a/mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/PartPipe.java b/mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/PartPipe.java
index 7c07c31a8..57be7031d 100644
--- a/mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/PartPipe.java
+++ b/mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/PartPipe.java
@@ -34,8 +34,8 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 public class PartPipe extends PartFramedConnection<EnumPipeMaterial, IFluidPipe, IFluidNetwork> implements IFluidPipe, TSlottedPart, JNormalOcclusion, IHollowConnect, JIconHitEffects
 {
-	protected FluidTank tank = new FluidTank(1 * FluidContainerRegistry.BUCKET_VOLUME);
-	private boolean isExtracting = false;
+	protected FluidTank tank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME);
+	private int pressure;
 
 	public PartPipe()
 	{
@@ -55,44 +55,16 @@ public class PartPipe extends PartFramedConnection<EnumPipeMaterial, IFluidPipe,
 	}
 
 	@Override
-	public void update()
+	public boolean doesTick()
 	{
-		super.update();
-
-		if (!world().isRemote)
-		{
-			if (isExtracting && getNetwork().getTank().getFluidAmount() < getNetwork().getTank().getCapacity())
-			{
-
-				for (int i = 0; i < this.getConnections().length; i++)
-				{
-					Object obj = this.getConnections()[i];
-
-					if (obj instanceof IFluidHandler)
-					{
-						FluidStack drain = ((IFluidHandler) obj).drain(ForgeDirection.getOrientation(i).getOpposite(), getMaxFlowRate(), true);
-						fill(null, drain, true);
-					}
-				}
-			}
-		}
+		return false;
 	}
 
 	@Override
 	public boolean activate(EntityPlayer player, MovingObjectPosition part, ItemStack item)
 	{
 		if (!world().isRemote)
-			System.out.println(getNetwork());
-		if (WrenchUtility.isUsableWrench(player, player.getCurrentEquippedItem(), x(), y(), z()))
-		{
-			if (!world().isRemote)
-			{
-				isExtracting = !isExtracting;
-				player.addChatMessage("Pipe extraction mode: " + isExtracting);
-				WrenchUtility.damageWrench(player, player.getCurrentEquippedItem(), x(), y(), z());
-			}
-			return true;
-		}
+			System.out.println("Pressure: " + pressure + " : " + tank.getFluidAmount());
 
 		return super.activate(player, part, item);
 	}
@@ -131,19 +103,19 @@ public class PartPipe extends PartFramedConnection<EnumPipeMaterial, IFluidPipe,
 	@Override
 	public int fill(ForgeDirection from, FluidStack resource, boolean doFill)
 	{
-		return getNetwork().fill(this, from, resource, doFill);
+		return tank.fill(resource, doFill);
 	}
 
 	@Override
 	public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain)
 	{
-		return null;
+		return tank.drain(resource.amount, doDrain);
 	}
 
 	@Override
 	public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain)
 	{
-		return null;
+		return tank.drain(maxDrain, doDrain);
 	}
 
 	@Override
@@ -202,13 +174,15 @@ public class PartPipe extends PartFramedConnection<EnumPipeMaterial, IFluidPipe,
 	}
 
 	@Override
-	public int getPressure()
+	public int getPressure(ForgeDirection dir)
 	{
-		if (this.getNetwork() != null)
-		{
-			return this.getNetwork().getPressure();
-		}
-		return 0;
+		return pressure;
+	}
+
+	@Override
+	public void setPressure(int amount)
+	{
+		pressure = amount;
 	}
 
 	@Override
@@ -217,16 +191,10 @@ public class PartPipe extends PartFramedConnection<EnumPipeMaterial, IFluidPipe,
 
 	}
 
-	@Override
-	public int getMaxPressure()
-	{
-		return 1000;
-	}
-
 	@Override
 	public int getMaxFlowRate()
 	{
-		return FluidContainerRegistry.BUCKET_VOLUME;
+		return 50;
 	}
 
 	@Override
@@ -240,20 +208,18 @@ public class PartPipe extends PartFramedConnection<EnumPipeMaterial, IFluidPipe,
 	public void save(NBTTagCompound nbt)
 	{
 		super.save(nbt);
-		nbt.setBoolean("isExtracting", isExtracting);
 	}
 
 	@Override
 	public void load(NBTTagCompound nbt)
 	{
 		super.load(nbt);
-		isExtracting = nbt.getBoolean("isExtracting");
 	}
 
 	@Override
 	public boolean canFlow()
 	{
-		return !isExtracting;
+		return true;
 	}
 
 }
\ No newline at end of file
diff --git a/mechanical/src/main/java/resonantinduction/mechanical/fluid/tank/TankNetwork.java b/mechanical/src/main/java/resonantinduction/mechanical/fluid/tank/TankNetwork.java
index 2f0033125..fd67e4037 100644
--- a/mechanical/src/main/java/resonantinduction/mechanical/fluid/tank/TankNetwork.java
+++ b/mechanical/src/main/java/resonantinduction/mechanical/fluid/tank/TankNetwork.java
@@ -75,13 +75,4 @@ public class TankNetwork extends FluidNetwork
 	{
 		return new TankNetwork();
 	}
-
-	@Override
-	public int getPressure()
-	{
-		// TODO implement a compression system that would cause a tank to build up pressure greater
-		// than normal ATM
-		return 0;
-	}
-
 }
diff --git a/mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/BlockHydrualicPump.java b/mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/BlockPump.java
similarity index 87%
rename from mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/BlockHydrualicPump.java
rename to mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/BlockPump.java
index 9b0f4d291..e392081b3 100644
--- a/mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/BlockHydrualicPump.java
+++ b/mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/BlockPump.java
@@ -9,9 +9,9 @@ import calclavia.lib.prefab.block.BlockRotatable;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-public class BlockHydrualicPump extends BlockRotatable
+public class BlockPump extends BlockRotatable
 {
-	public BlockHydrualicPump(int id)
+	public BlockPump(int id)
 	{
 		super(id, UniversalElectricity.machine);
 		setTextureName(Reference.PREFIX + "material_steel");
@@ -21,7 +21,7 @@ public class BlockHydrualicPump extends BlockRotatable
 	@Override
 	public TileEntity createNewTileEntity(World world)
 	{
-		return new TileHydraulicPump();
+		return new TilePump();
 	}
 
 	@Override
diff --git a/mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/RenderPump.java b/mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/RenderPump.java
new file mode 100644
index 000000000..7c5a11f1e
--- /dev/null
+++ b/mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/RenderPump.java
@@ -0,0 +1,34 @@
+package resonantinduction.mechanical.fluid.transport;
+
+import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.client.model.AdvancedModelLoader;
+import net.minecraftforge.client.model.IModelCustom;
+
+import org.lwjgl.opengl.GL11;
+
+import resonantinduction.core.Reference;
+import calclavia.lib.render.RenderUtility;
+
+public class RenderPump extends TileEntitySpecialRenderer
+{
+	public static final IModelCustom MODEL = AdvancedModelLoader.loadModel(Reference.MODEL_DIRECTORY + "pump.tcn");
+	public static final ResourceLocation TEXTURE = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_PATH + "pump.png");
+
+	public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f)
+	{
+		TilePump tile = (TilePump) tileEntity;
+
+		GL11.glPushMatrix();
+		GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5);
+
+		GL11.glRotatef(90, 0, 1, 0);
+		if (tile.worldObj != null)
+			RenderUtility.rotateBlockBasedOnDirection(tile.getDirection());
+
+		bindTexture(TEXTURE);
+		MODEL.renderAll();
+		GL11.glPopMatrix();
+	}
+}
diff --git a/mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/TileHydraulicPump.java b/mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/TilePump.java
similarity index 56%
rename from mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/TileHydraulicPump.java
rename to mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/TilePump.java
index c4d00dbfc..b2a257e19 100644
--- a/mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/TileHydraulicPump.java
+++ b/mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/TilePump.java
@@ -7,23 +7,14 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
 import resonantinduction.api.mechanical.fluid.IFluidPipe;
+import resonantinduction.api.mechanical.fluid.IPressure;
 import universalelectricity.api.vector.Vector3;
 import calclavia.lib.prefab.tile.IRotatable;
 import calclavia.lib.prefab.tile.TileAdvanced;
 
-public class TileHydraulicPump extends TileAdvanced implements IFluidHandler, IRotatable
+public class TilePump extends TileAdvanced implements IFluidHandler, IRotatable, IPressure
 {
-	ForgeDirection facing = ForgeDirection.UNKNOWN;
-	boolean input = true;
-	final int maxFlow = 1000;
-	int volFilled = 0;
-	int averageVol = 0;
-
-	@Override
-	public void updateEntity()
-	{
-		super.updateEntity();
-	}
+	private int pressure;
 
 	@Override
 	public int fill(ForgeDirection from, FluidStack resource, boolean doFill)
@@ -31,61 +22,42 @@ public class TileHydraulicPump extends TileAdvanced implements IFluidHandler, IR
 		if (from == getDirection().getOpposite())
 		{
 			TileEntity tileOut = new Vector3(this).translate(from.getOpposite()).getTileEntity(this.worldObj);
-			TileEntity tileIn = new Vector3(this).translate(from).getTileEntity(this.worldObj);
-			if (tileIn instanceof IFluidPipe && tileOut instanceof IFluidPipe)
-			{
-				if (((IFluidPipe) tileIn).getPressure() <= ((IFluidPipe) tileOut).getPressure())
-				{
-					return 0;
-				}
-			}
-			if (tileOut instanceof IFluidHandler && !(tileOut instanceof TileHydraulicPump))
-			{
-				// TODO pass fluid on to the other side of the motor and get average flow rate
-			}
+
+			if (tileOut instanceof IFluidHandler)
+				return ((IFluidHandler) tileOut).fill(from, resource, doFill);
 		}
+
 		return 0;
 	}
 
 	@Override
 	public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain)
 	{
-		// TODO Auto-generated method stub
 		return null;
 	}
 
 	@Override
 	public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain)
 	{
-		// TODO Auto-generated method stub
 		return null;
 	}
 
 	@Override
 	public boolean canFill(ForgeDirection from, Fluid fluid)
 	{
-		return !input && from == this.getDirection().getOpposite();
+		return from == this.getDirection().getOpposite();
 	}
 
 	@Override
 	public boolean canDrain(ForgeDirection from, Fluid fluid)
 	{
-		// TODO Auto-generated method stub
 		return false;
 	}
 
 	@Override
 	public FluidTankInfo[] getTankInfo(ForgeDirection from)
 	{
-		if (from == getDirection().getOpposite())
-		{
-			TileEntity tile = new Vector3(this).translate(from.getOpposite()).getTileEntity(this.worldObj);
-			if (tile instanceof IFluidHandler && !(tile instanceof TileHydraulicPump))
-			{
-				return ((IFluidHandler) tile).getTankInfo(from);
-			}
-		}
-		return new FluidTankInfo[1];
+		return null;
 	}
 
 	@Override
@@ -100,4 +72,25 @@ public class TileHydraulicPump extends TileAdvanced implements IFluidHandler, IR
 		this.worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, direction.ordinal(), 3);
 	}
 
+	@Override
+	public void setPressure(int amount)
+	{
+		pressure = amount;
+	}
+
+	@Override
+	public int getPressure(ForgeDirection dir)
+	{
+		if (dir == getDirection())
+		{
+			return 20;
+		}
+		else if (dir == getDirection().getOpposite())
+		{
+			return -25;
+		}
+
+		return 0;
+	}
+
 }
diff --git a/src/main/java/resonantinduction/api/mechanical/fluid/IFluidNetwork.java b/src/main/java/resonantinduction/api/mechanical/fluid/IFluidNetwork.java
index fd8c9bdb7..6eff721c8 100644
--- a/src/main/java/resonantinduction/api/mechanical/fluid/IFluidNetwork.java
+++ b/src/main/java/resonantinduction/api/mechanical/fluid/IFluidNetwork.java
@@ -56,7 +56,4 @@ public interface IFluidNetwork extends INodeNetwork<IFluidNetwork, IFluidConnect
 
 	/** Information about the network's tank */
 	FluidTankInfo[] getTankInfo();
-
-	int getPressure();
-
 }
diff --git a/src/main/java/resonantinduction/api/mechanical/fluid/IFluidPipe.java b/src/main/java/resonantinduction/api/mechanical/fluid/IFluidPipe.java
index b154900b4..806c9d755 100644
--- a/src/main/java/resonantinduction/api/mechanical/fluid/IFluidPipe.java
+++ b/src/main/java/resonantinduction/api/mechanical/fluid/IFluidPipe.java
@@ -1,5 +1,7 @@
 package resonantinduction.api.mechanical.fluid;
 
+import net.minecraftforge.common.ForgeDirection;
+
 /**
  * Applied to tiles that are pipes and support pressure
  * 
@@ -7,14 +9,6 @@ package resonantinduction.api.mechanical.fluid;
  */
 public interface IFluidPipe extends IFluidConnector, IPressureInput
 {
-	/**
-	 * Max pressure this pipe can support.
-	 * 
-	 * @return amount in pascals.
-	 */
-	int getMaxPressure();
-
-	int getPressure();
 
 	/**
 	 * Max flow rate of fluid this pipe can support
@@ -22,4 +16,5 @@ public interface IFluidPipe extends IFluidConnector, IPressureInput
 	 * @return amount in liters.
 	 */
 	int getMaxFlowRate();
+
 }
diff --git a/src/main/java/resonantinduction/api/mechanical/fluid/IPressure.java b/src/main/java/resonantinduction/api/mechanical/fluid/IPressure.java
new file mode 100644
index 000000000..9a972a35c
--- /dev/null
+++ b/src/main/java/resonantinduction/api/mechanical/fluid/IPressure.java
@@ -0,0 +1,10 @@
+package resonantinduction.api.mechanical.fluid;
+
+import net.minecraftforge.common.ForgeDirection;
+
+public interface IPressure
+{
+	public void setPressure(int amount);
+
+	public int getPressure(ForgeDirection dir);
+}
diff --git a/src/main/java/resonantinduction/api/mechanical/fluid/IPressureInput.java b/src/main/java/resonantinduction/api/mechanical/fluid/IPressureInput.java
index 837367d0e..706e5dc0b 100644
--- a/src/main/java/resonantinduction/api/mechanical/fluid/IPressureInput.java
+++ b/src/main/java/resonantinduction/api/mechanical/fluid/IPressureInput.java
@@ -7,7 +7,7 @@ import net.minecraftforge.common.ForgeDirection;
  * 
  * @author DarkGaurdsman
  */
-public interface IPressureInput
+public interface IPressureInput extends IPressure
 {
 	public int getPressureIn(ForgeDirection side);
 
diff --git a/src/main/java/resonantinduction/core/prefab/fluid/PipeNetwork.java b/src/main/java/resonantinduction/core/prefab/fluid/PipeNetwork.java
index 7836aabce..60b219780 100644
--- a/src/main/java/resonantinduction/core/prefab/fluid/PipeNetwork.java
+++ b/src/main/java/resonantinduction/core/prefab/fluid/PipeNetwork.java
@@ -7,10 +7,12 @@ import java.util.Map.Entry;
 
 import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidTank;
 import net.minecraftforge.fluids.IFluidHandler;
 import resonantinduction.api.mechanical.fluid.IFluidConnector;
 import resonantinduction.api.mechanical.fluid.IFluidNetwork;
 import resonantinduction.api.mechanical.fluid.IFluidPipe;
+import resonantinduction.api.mechanical.fluid.IPressure;
 import calclavia.lib.utility.FluidUtility;
 
 /**
@@ -23,12 +25,27 @@ public class PipeNetwork extends FluidNetwork
 	public HashMap<IFluidHandler, EnumSet<ForgeDirection>> sideMap = new HashMap<IFluidHandler, EnumSet<ForgeDirection>>();
 	public HashMap<IFluidHandler, IFluidConnector> connectionMap = new HashMap<IFluidHandler, IFluidConnector>();
 	public int maxFlowRate = 0;
-	public int maxPressure = 0;
 	public int currentPressure = 0;
 	public int currentFlowRate = 0;
 
 	@Override
 	public void update()
+	{
+		for (IFluidConnector connector : getConnectors())
+		{
+			if (connector instanceof IFluidPipe)
+			{
+				calculatePressure((IFluidPipe) connector);
+				distribute((IFluidPipe) connector);
+			}
+		}
+	}
+
+	/**
+	 * Old pipe distribution code.
+	 */
+	@Deprecated
+	public void oldDistribution()
 	{
 		/*
 		 * Slight delay to allow visual effect to take place before draining the pipe's internal
@@ -58,7 +75,7 @@ public class PipeNetwork extends FluidNetwork
 				{
 					stack.amount -= handler.fill(dir, FluidUtility.getStack(stack, Math.min(volPerSide, this.maxFlowRate)), true);
 				}
-				
+
 				if (sideCount > 1)
 					--sideCount;
 				if (volPer <= 0)
@@ -80,10 +97,130 @@ public class PipeNetwork extends FluidNetwork
 		reconstructTankInfo();
 	}
 
+	/**
+	 * Calculate pressure in this pipe.
+	 */
+	public void calculatePressure(IFluidPipe sourcePipe)
+	{
+		int totalPressure = 0;
+		int findCount = 0;
+		int minPressure = 0;
+		int maxPressure = 0;
+
+		for (int i = 0; i < 6; i++)
+		{
+			Object obj = sourcePipe.getConnections()[i];
+
+			if (obj instanceof IPressure)
+			{
+				int pressure = ((IPressure) obj).getPressure(ForgeDirection.getOrientation(i).getOpposite());
+				minPressure = Math.min(pressure, minPressure);
+				maxPressure = Math.max(pressure, maxPressure);
+				totalPressure += pressure;
+				findCount++;
+			}
+		}
+
+		if (findCount == 0)
+		{
+			sourcePipe.setPressure(0);
+		}
+		else
+		{
+			/**
+			 * Create pressure loss.
+			 */
+			if (minPressure < 0)
+				minPressure++;
+			if (maxPressure > 0)
+				maxPressure--;
+
+			sourcePipe.setPressure(Math.max(minPressure, Math.min(maxPressure, totalPressure / findCount + Integer.signum(totalPressure))));
+		}
+	}
+
+	/**
+	 * Distribute fluid in this pipe based on pressure.
+	 */
+	public static void distribute(IFluidPipe sourcePipe)
+	{
+		for (int i = 0; i < 6; i++)
+		{
+			Object obj = sourcePipe.getConnections()[i];
+
+			if (obj instanceof IFluidPipe)
+			{
+				IFluidPipe otherPipe = (IFluidPipe) obj;
+
+				/**
+				 * 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());
+
+				if (pressureA >= pressureB)
+				{
+					FluidTank tankA = sourcePipe.getInternalTank();
+
+					if (tankA != null)
+					{
+						int amountA = tankA.getFluidAmount();
+
+						if (amountA > 0)
+						{
+							FluidTank tankB = otherPipe.getInternalTank();
+
+							if (tankB != null)
+							{
+								int amountB = tankB.getFluidAmount();
+
+								int quantity = Math.max(pressureA > pressureB ? 25 : 0, (amountA - amountB) / 2);
+								quantity = Math.min(Math.min(quantity, tankB.getCapacity() - amountB), amountA);
+
+								if (quantity > 0)
+								{
+									tankA.drain(quantity, true);
+									tankB.fill(new FluidStack(tankA.getFluid().getFluid(), quantity), true);
+								}
+							}
+						}
+					}
+				}
+			}
+			else if (obj instanceof IFluidHandler)
+			{
+				IFluidHandler fluidHandler = (IFluidHandler) obj;
+				ForgeDirection dir = ForgeDirection.getOrientation(i);
+				int pressure = sourcePipe.getPressure(dir);
+				int tankPressure = fluidHandler instanceof IPressure ? ((IPressure) fluidHandler).getPressure(dir.getOpposite()) : 0;
+				FluidTank sourceTank = sourcePipe.getInternalTank();
+
+				int transferAmount = (Math.max(pressure, tankPressure) - Math.min(pressure, tankPressure)) * sourcePipe.getMaxFlowRate();
+
+				if (pressure > tankPressure)
+				{
+					if (sourceTank.getFluidAmount() > 0 && transferAmount > 0)
+					{
+						FluidStack drainStack = sourceTank.drain(transferAmount, false);
+						sourceTank.drain(fluidHandler.fill(dir.getOpposite(), drainStack, true), true);
+					}
+				}
+				else if (pressure < tankPressure)
+				{
+					if (transferAmount > 0)
+					{
+						FluidStack drainStack = fluidHandler.drain(dir.getOpposite(), transferAmount, false);
+						fluidHandler.drain(dir.getOpposite(), sourceTank.fill(drainStack, true), true);
+					}
+				}
+			}
+		}
+	}
+
 	@Override
 	public boolean canUpdate()
 	{
-		return getTank().getFluidAmount() > 0 && sideMap.size() > 0 && getConnectors().size() > 0;
+		return getConnectors().size() > 0;
 	}
 
 	@Override
@@ -97,7 +234,6 @@ public class PipeNetwork extends FluidNetwork
 	{
 		this.sideMap.clear();
 		this.maxFlowRate = Integer.MAX_VALUE;
-		this.maxPressure = Integer.MAX_VALUE;
 		super.reconstruct();
 	}
 
@@ -106,14 +242,6 @@ public class PipeNetwork extends FluidNetwork
 	{
 		super.reconstructConnector(connector);
 
-		if (connector instanceof IFluidPipe)
-		{
-			if (((IFluidPipe) connector).getMaxFlowRate() < this.maxFlowRate)
-				this.maxFlowRate = ((IFluidPipe) connector).getMaxFlowRate();
-
-			if (((IFluidPipe) connector).getMaxPressure() < this.maxPressure)
-				this.maxPressure = ((IFluidPipe) connector).getMaxPressure();
-		}
 		for (int i = 0; i < 6; i++)
 		{
 			if (connector.getConnections()[i] instanceof IFluidHandler && !(connector.getConnections()[i] instanceof IFluidPipe))
@@ -154,10 +282,4 @@ public class PipeNetwork extends FluidNetwork
 	{
 		return new PipeNetwork();
 	}
-
-	@Override
-	public int getPressure()
-	{
-		return this.currentPressure;
-	}
 }
diff --git a/src/main/models/Archive/Pump.tcn b/src/main/models/Archive/Pump.tcn
index 6789f39c71e9ca262c7e2ee48cdf12cfae0819e1..b84fc5a83d20ab9bc168795a0b8968c4ee890144 100644
GIT binary patch
literal 3158
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

literal 1783
zcmbW2eNfT|7{`CXBoP!tR7i4`Z)w&LQ)#}YGv`Z<T2?d>Q_;+K5QfrbspT?flhkAi
ztYx((Y7;V>Z<#Yo0aH^md~4Ip1WYI5vS6-1x?6X<+jh@A&vVb+bKk$dpZgL+!0({|
z0MG}-#nwCb*iC`1g8+br1pp{u10<!yP!qSYk`fI7tJNm}SOcH|@=nbyn|$e-cej!|
zpYlBp)tS{gsa@ONgWJ5hA-5>eW!p-dhl_NI*2-9ZI9ANr*R0gOym87oHJJuQimcJ?
z>^b?u5ARdT2L*l&1>gM+KIC^a{o-(3z1i{CeKX4!ELtj^mi5X7EnJKv?l!gt^VJ+_
zqC8-Wp+6Fjr1$dR=1!)Ty%-^qp^IV=JQoaeU`b7+PHvi6AZ+V-=o8aD6Pc&Z+YonG
z&Xm{6!aoP68&-HtSw1OuN`r6EqR!e&WNkNkM_gp=v5{wEY<}7~9J<~W7B>iIM<C*P
z`n9K+xj~htA98Y#MXoYREM)?JSZD=xB8NwfFh}NYtWP}jSee}D`68nG8mrp9x>!`)
zaLb3TbHn(4Jmpev44)4+O1OXXk|if_-hcYe!;#(s{pey->aDAlue=5Jx51a}>)bP2
zxWl&6GP{qcU#I6zdOR)UC<+()mZz9Ot{by9`j!@AH$aQ<A=&X=5v5-}zou{`QXPfQ
zClm&Gi0Cd>_v3jIozcEd0KTqfOb&v|tIk###Pj9)$NYC$kJSyr6Oh}v+Poh~NY_i_
zHVHNT`U%d%oKg{l;7`+jw04I{KsBT*akS_)_KHw0nZ)3+UgF{ng1RqVyP7i1;>n{m
z*`%A}57sLS?>^YaOz*0j^obE}apdj|bnpia249w_Zkjx`&lbMSCBb5^x<wZT-HC7f
zDQ$g+<k`%<nyQM6!SpNr1H4kP?wq(~leFgK_Q0h{tev#}+fCJEKF=s_ERHO=u_88{
z<6)9Zq@rCKS*DKIbNqK{d~ufO+g#RVyM+5oXStoN&^}NG{Au}fH$)6#w+>w|oT`0b
z-nX=y;eAD@@U~4%>Cu+8mEIP}T_b$0?*4Q%7WC4>FXCwUBFZ+ucHJ4P7?zAqKFyPa
z@wY>Ih<~%bNVqj&c-8u&tBqK-K9P}>noeb<GicOpsmXEw27p=k3;OgF=hvvn$O-jg
zDiqXbXeDWb*dXM#e8|3nj-9GK@LAdYruS%%I8CEuv^HlVySdvQ96*41ZaRxWFB|3H
zew%+~>fpO`3Hb@-;F3p$B<e@xMGuAz8eJCUMaKF&CO0=nmwhhx&D|Jj+G)ABkR0zN
z$sfo-WH^Z)3(kyEy_Z!T2MS?7kM81woEon>^A0l?8V^t6V>Ld(x&czViMjH}?lk87
zYb<jyPyNSm|G|+SRX!!9HPdf8k(<R!8G7Bc7_NFeG{fv2TA>f&6mrgZ!)7t7Xmqa>
zQc5+Xv}$x!%Y0q>z;@W6xsQ>v{h?I75#x*(vWlRSM>-v>bLxWUhXYQVP%U#q@jmSp
z;;ovH?@Fd~zIK=cKUCM`lkhlaoEwgSLsj$#zktcjk=6Ehh{u(hMPah^v_;oiqq&8Z
zjwB|N8NT22LdQ@pDy?LOq=3T%>%&xC?iyXo0gu#(LEgDpjjlG5)O=Zd<XWh@8R4Ek
z8&%cgBJ<GQTbWqVs9(`^YU}LhU_XpZvCI=tbW<7fdDNBz0^We~mgl(b3fib#+v~~4
z=VjbM6zQcDoRpbGmLa8s2L;uwue5EQfdp^GHOWW|o7B8}Nu_WNjKxE7m6XrA*V)F4
zw5M3=#t&c!7yRbX0UECRLfFxDg#9-Kvzl??CndYW4bLdFrN{F0Fz5{j@MgtX?#I3S
z*@pdMcB>!tLem#!kufcCYE{p<>V)wy18MY!Zlb5`F#a=871Sx9xd1|&Wl}!iD^h6}
zgHIR-HaMIQRX-6!9W7)&-Bgp3C<3)ga{J*ozbLM|Q<hGYw2QFy+|V6~_83<ohW5yl
zyWaxLPenC7;VB6-Cq@-Y&PEJ;{Wu#<K>y6bw5YaFSyCKb6k{+12{K*MOF^GNO{2{0
zAfd)||1WfMAR6Xn?rl8OKhQ(ved=cd5JT30wgUeg6K|s7?f6fj@vii{7`{~nR#w6M
VA5aoQ^dNtUfL5z%b=$tV{scc0C<p)m

diff --git a/src/main/models/Archive/BasicPump.tcn b/src/main/resources/assets/resonantinduction/models/pump.tcn
similarity index 100%
rename from src/main/models/Archive/BasicPump.tcn
rename to src/main/resources/assets/resonantinduction/models/pump.tcn