From afd1bbde71e0a08245d9704f255653f241e33656 Mon Sep 17 00:00:00 2001
From: Calclavia <admin@calclavia.com>
Date: Mon, 20 Jan 2014 15:24:50 +0800
Subject: [PATCH] Updated UE

---
 .../electrical/battery/BatteryStructure.java  |   2 +-
 .../fluid/network/FluidNetwork.java           | 126 ------------------
 .../mechanical/fluid/network/PipeNetwork.java |   7 +
 .../mechanical/fluid/tank/TankNetwork.java    |   7 +
 .../mechanical/network/MechanicalNetwork.java | 113 +---------------
 5 files changed, 21 insertions(+), 234 deletions(-)

diff --git a/src/main/java/resonantinduction/electrical/battery/BatteryStructure.java b/src/main/java/resonantinduction/electrical/battery/BatteryStructure.java
index ca410c6a..aece22f0 100644
--- a/src/main/java/resonantinduction/electrical/battery/BatteryStructure.java
+++ b/src/main/java/resonantinduction/electrical/battery/BatteryStructure.java
@@ -48,7 +48,7 @@ public class BatteryStructure extends Structure<TileBattery>
 	}
 
 	@Override
-	protected void refreshNode(TileBattery node)
+	protected void reconstructNode(TileBattery node)
 	{
 		node.setNetwork(this);
 	}
diff --git a/src/main/java/resonantinduction/mechanical/fluid/network/FluidNetwork.java b/src/main/java/resonantinduction/mechanical/fluid/network/FluidNetwork.java
index ecf88477..fa5a768a 100644
--- a/src/main/java/resonantinduction/mechanical/fluid/network/FluidNetwork.java
+++ b/src/main/java/resonantinduction/mechanical/fluid/network/FluidNetwork.java
@@ -177,132 +177,6 @@ public abstract class FluidNetwork extends Network<IFluidNetwork, IFluidConnecto
 		}
 	}
 
-	@Override
-	public IFluidNetwork merge(IFluidNetwork network)
-	{
-		FluidNetwork newNetwork = null;
-		if (network != null && network.getClass().isAssignableFrom(this.getClass()) && network != this)
-		{
-
-			try
-			{
-				newNetwork = this.getClass().newInstance();
-
-				newNetwork.getConnectors().addAll(this.getConnectors());
-				newNetwork.getConnectors().addAll(network.getConnectors());
-
-				network.getConnectors().clear();
-				network.getNodes().clear();
-				this.getConnectors().clear();
-				this.getNodes().clear();
-
-				newNetwork.reconstruct();
-
-			}
-			catch (Exception e)
-			{
-				e.printStackTrace();
-			}
-
-		}
-		return newNetwork;
-	}
-
-	@Override
-	public void split(IFluidConnector splitPoint)
-	{
-		this.removeConnector(splitPoint);
-		this.reconstruct();
-
-		/**
-		 * Loop through the connected blocks and attempt to see if there are connections between the
-		 * two points elsewhere.
-		 */
-		Object[] connectedBlocks = splitPoint.getConnections();
-
-		for (int i = 0; i < connectedBlocks.length; i++)
-		{
-			Object connectedBlockA = connectedBlocks[i];
-
-			if (connectedBlockA instanceof IFluidConnector)
-			{
-				for (int ii = 0; ii < connectedBlocks.length; ii++)
-				{
-					final Object connectedBlockB = connectedBlocks[ii];
-
-					if (connectedBlockA != connectedBlockB && connectedBlockB instanceof IFluidConnector)
-					{
-						ConnectionPathfinder finder = new ConnectionPathfinder((IFluidConnector) connectedBlockB, splitPoint);
-						finder.findNodes((IFluidConnector) connectedBlockA);
-
-						if (finder.results.size() <= 0)
-						{
-							try
-							{
-								/**
-								 * The connections A and B are not connected anymore. Give them both
-								 * a new common network.
-								 */
-								IFluidNetwork newNetwork = this.getClass().newInstance();
-
-								for (IConnector node : finder.closedSet)
-								{
-									if (node != splitPoint && node instanceof IFluidConnector)
-									{
-										newNetwork.addConnector((IFluidConnector) node);
-									}
-								}
-								newNetwork.reconstruct();
-							}
-							catch (Exception e)
-							{
-								e.printStackTrace();
-							}
-
-						}
-					}
-				}
-			}
-		}
-	}
-
-	@Override
-	public void split(IFluidConnector connectorA, IFluidConnector connectorB)
-	{
-		this.reconstruct();
-
-		/** Check if connectorA connects with connectorB. */
-		ConnectionPathfinder finder = new ConnectionPathfinder(connectorB);
-		finder.findNodes(connectorA);
-
-		if (finder.results.size() <= 0)
-		{
-			/**
-			 * The connections A and B are not connected anymore. Give them both a new common
-			 * network.
-			 */
-			IFluidNetwork newNetwork;
-			try
-			{
-				newNetwork = this.getClass().newInstance();
-
-				for (IConnector node : finder.closedSet)
-				{
-					if (node instanceof IFluidConnector)
-					{
-						newNetwork.addConnector((IFluidConnector) node);
-					}
-				}
-
-				newNetwork.reconstruct();
-			}
-			catch (Exception e)
-			{
-				e.printStackTrace();
-			}
-		}
-	}
-
 	@Override
 	public FluidTank getTank()
 	{
diff --git a/src/main/java/resonantinduction/mechanical/fluid/network/PipeNetwork.java b/src/main/java/resonantinduction/mechanical/fluid/network/PipeNetwork.java
index 3047e1a3..30405438 100644
--- a/src/main/java/resonantinduction/mechanical/fluid/network/PipeNetwork.java
+++ b/src/main/java/resonantinduction/mechanical/fluid/network/PipeNetwork.java
@@ -9,6 +9,7 @@ import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidHandler;
 import resonantinduction.api.fluid.IFluidConnector;
+import resonantinduction.api.fluid.IFluidNetwork;
 import resonantinduction.api.fluid.IFluidPipe;
 import universalelectricity.api.vector.Vector3;
 import calclavia.lib.utility.FluidUtility;
@@ -120,4 +121,10 @@ public class PipeNetwork extends FluidNetwork
 	{
 		return null;
 	}
+
+	@Override
+	public IFluidNetwork newInstance()
+	{
+		return new PipeNetwork();
+	}
 }
diff --git a/src/main/java/resonantinduction/mechanical/fluid/tank/TankNetwork.java b/src/main/java/resonantinduction/mechanical/fluid/tank/TankNetwork.java
index f3c0257b..41ceaa26 100644
--- a/src/main/java/resonantinduction/mechanical/fluid/tank/TankNetwork.java
+++ b/src/main/java/resonantinduction/mechanical/fluid/tank/TankNetwork.java
@@ -6,6 +6,7 @@ import java.util.Set;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.fluids.FluidStack;
 import resonantinduction.api.fluid.IFluidConnector;
+import resonantinduction.api.fluid.IFluidNetwork;
 import resonantinduction.mechanical.fluid.network.FluidNetwork;
 
 /**
@@ -69,4 +70,10 @@ public class TankNetwork extends FluidNetwork
 		}
 	}
 
+	@Override
+	public IFluidNetwork newInstance()
+	{
+		return new TankNetwork();
+	}
+
 }
diff --git a/src/main/java/resonantinduction/mechanical/network/MechanicalNetwork.java b/src/main/java/resonantinduction/mechanical/network/MechanicalNetwork.java
index 449b321f..7461aabe 100644
--- a/src/main/java/resonantinduction/mechanical/network/MechanicalNetwork.java
+++ b/src/main/java/resonantinduction/mechanical/network/MechanicalNetwork.java
@@ -246,112 +246,6 @@ public class MechanicalNetwork extends Network<IMechanicalNetwork, IMechanicalCo
 		}
 	}
 
-	@Override
-	public IMechanicalNetwork merge(IMechanicalNetwork network)
-	{
-		if (network.getClass().isAssignableFrom(this.getClass()) && network != this)
-		{
-			MechanicalNetwork newNetwork = new MechanicalNetwork();
-			newNetwork.getConnectors().addAll(this.getConnectors());
-			newNetwork.getConnectors().addAll(network.getConnectors());
-			network.getConnectors().clear();
-			network.getNodes().clear();
-			this.getConnectors().clear();
-			this.getNodes().clear();
-
-			newNetwork.reconstruct();
-			return newNetwork;
-		}
-
-		return null;
-	}
-
-	@Override
-	public void split(IMechanicalConnector splitPoint)
-	{
-		this.removeConnector(splitPoint);
-		this.reconstruct();
-
-		/**
-		 * Loop through the connected blocks and attempt to see if there are connections between the
-		 * two points elsewhere.
-		 */
-		Object[] connectedBlocks = splitPoint.getConnections();
-
-		for (int i = 0; i < connectedBlocks.length; i++)
-		{
-			Object connectedBlockA = connectedBlocks[i];
-
-			if (connectedBlockA instanceof IMechanicalConnector)
-			{
-				for (int ii = 0; ii < connectedBlocks.length; ii++)
-				{
-					final Object connectedBlockB = connectedBlocks[ii];
-
-					if (connectedBlockA != connectedBlockB && connectedBlockB instanceof IMechanicalConnector)
-					{
-						ConnectionPathfinder finder = new ConnectionPathfinder((IConnector) connectedBlockB, splitPoint);
-						finder.findNodes((IConnector) connectedBlockA);
-
-						if (finder.results.size() <= 0)
-						{
-							try
-							{
-								/**
-								 * The connections A and B are not connected anymore. Give them both
-								 * a new common network.
-								 */
-								IMechanicalNetwork newNetwork = new MechanicalNetwork();
-								for (IConnector node : finder.closedSet)
-								{
-									if (node != splitPoint && node instanceof IMechanicalConnector)
-									{
-										newNetwork.addConnector((IMechanicalConnector) node);
-									}
-								}
-								newNetwork.reconstruct();
-							}
-							catch (Exception e)
-							{
-								e.printStackTrace();
-							}
-
-						}
-					}
-				}
-			}
-		}
-	}
-
-	@Override
-	public void split(IMechanicalConnector connectorA, IMechanicalConnector connectorB)
-	{
-		this.reconstruct();
-
-		/** Check if connectorA connects with connectorB. */
-		ConnectionPathfinder finder = new ConnectionPathfinder(connectorB);
-		finder.findNodes(connectorA);
-
-		if (finder.results.size() <= 0)
-		{
-			/**
-			 * The connections A and B are not connected anymore. Give them both a new common
-			 * network.
-			 */
-			IMechanicalNetwork newNetwork = new MechanicalNetwork();
-
-			for (IConnector node : finder.closedSet)
-			{
-				if (node instanceof IMechanicalConnector)
-				{
-					newNetwork.addConnector((IMechanicalConnector) node);
-				}
-			}
-
-			newNetwork.reconstruct();
-		}
-	}
-
 	@Override
 	public float getRotation()
 	{
@@ -366,10 +260,15 @@ public class MechanicalNetwork extends Network<IMechanicalNetwork, IMechanicalCo
 		return rotation;
 	}
 
+	@Override
+	public IMechanicalNetwork newInstance()
+	{
+		return new MechanicalNetwork();
+	}
+
 	@Override
 	public String toString()
 	{
 		return this.getClass().getSimpleName() + "[" + this.hashCode() + ", Handlers: " + getNodes().size() + ", Connectors: " + getConnectors().size() + ", Power:" + getPower() + "]";
 	}
-
 }