Renamed Fluid network package to match core

Forgot i renamed the core package for tile networks a  while back. Since
when building the core this package is actually copied into it best i
make sure it is done right.

src/dark/core/prefab/tilenetwork/fluid/FluidCraftingHandler.java

@@ -1,4 +1,4 @@
-package dark.core.network.fluid;
+package dark.core.prefab.tilenetwork.fluid;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -9,10 +9,10 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
-import dark.core.network.fluid.FluidRecipeInfo.SimpleFluidRecipe;
 import dark.core.prefab.helpers.FluidHelper;
 import dark.core.prefab.helpers.Pair;
 import dark.core.prefab.helpers.Triple;
+import dark.core.prefab.tilenetwork.fluid.FluidRecipeInfo.SimpleFluidRecipe;
 
 /** Handles all kinds of process involving mixing Fluids with other fluids and/or Items, Blocks,
  * ItemStack, or Liquids

src/dark/core/prefab/tilenetwork/fluid/FluidNetworkHelper.java

@@ -1,4 +1,4 @@
-package dark.core.network.fluid;
+package dark.core.prefab.tilenetwork.fluid;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;

src/dark/core/prefab/tilenetwork/fluid/FluidPressurePack.java

@@ -1,4 +1,4 @@
-package dark.core.network.fluid;
+package dark.core.prefab.tilenetwork.fluid;
 
 import net.minecraftforge.fluids.FluidStack;
 

src/dark/core/prefab/tilenetwork/fluid/FluidRecipeInfo.java

@@ -1,4 +1,4 @@
-package dark.core.network.fluid;
+package dark.core.prefab.tilenetwork.fluid;
 
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;

src/dark/core/prefab/tilenetwork/fluid/NetworkFluidContainers.java

@@ -1,4 +1,4 @@
-package dark.core.network.fluid;
+package dark.core.prefab.tilenetwork.fluid;
 
 import java.util.ArrayList;
 import java.util.List;

src/dark/core/prefab/tilenetwork/fluid/NetworkFluidTiles.java

@@ -1,4 +1,4 @@
-package dark.core.network.fluid;
+package dark.core.prefab.tilenetwork.fluid;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -224,7 +224,7 @@ public class NetworkFluidTiles extends NetworkTileEntities
 
             this.readDataFromTiles();
             network.readDataFromTiles();
-            Object result = FluidNetworkHelper.getMergeResult(this.combinedStorage().getFluid(), network.combinedStorage().getFluid());
+            Object result = FluidCraftingHandler.getMergeResult(this.combinedStorage().getFluid(), network.combinedStorage().getFluid());
             if (mergePoint instanceof TileEntity)
             {
                 World world = ((TileEntity) mergePoint).worldObj;
@@ -309,7 +309,7 @@ public class NetworkFluidTiles extends NetworkTileEntities
         newNetwork.getNetworkMemebers().addAll(network.getNetworkMemebers());
 
         newNetwork.cleanUpMembers();
-        newNetwork.combinedStorage().setFluid(FluidNetworkHelper.mergeFluidStacks(one, two));
+        newNetwork.combinedStorage().setFluid(FluidCraftingHandler.mergeFluidStacks(one, two));
         newNetwork.writeDataToTiles();
     }
 

src/dark/core/prefab/tilenetwork/fluid/NetworkPipes.java

@@ -1,4 +1,4 @@
-package dark.core.network.fluid;
+package dark.core.prefab.tilenetwork.fluid;
 
 import java.util.HashMap;
 import java.util.Iterator;

src/dark/fluid/common/machines/TileEntityReleaseValve.java

@@ -16,8 +16,8 @@ import dark.api.fluid.INetworkPipe;
 import dark.api.parts.ITileConnector;
 import dark.core.interfaces.ColorCode;
 import dark.core.interfaces.ColorCode.IColorCoded;
-import dark.core.network.fluid.NetworkPipes;
 import dark.core.prefab.helpers.ConnectionHelper;
+import dark.core.prefab.tilenetwork.fluid.NetworkPipes;
 import dark.fluid.common.prefab.TileEntityFluidDevice;
 
 public class TileEntityReleaseValve extends TileEntityFluidDevice implements ITileConnector, IToolReadOut

src/dark/fluid/common/machines/TileEntityTank.java

@@ -36,10 +36,10 @@ import dark.core.common.DarkMain;
 import dark.core.interfaces.ColorCode;
 import dark.core.interfaces.ColorCode.IColorCoded;
 import dark.core.network.PacketHandler;
-import dark.core.network.fluid.NetworkFluidContainers;
-import dark.core.network.fluid.NetworkFluidTiles;
 import dark.core.prefab.helpers.FluidHelper;
 import dark.core.prefab.tilenetwork.NetworkTileEntities;
+import dark.core.prefab.tilenetwork.fluid.NetworkFluidContainers;
+import dark.core.prefab.tilenetwork.fluid.NetworkFluidTiles;
 import dark.fluid.common.prefab.TileEntityFluidStorage;
 
 public class TileEntityTank extends TileEntityFluidStorage implements IFluidHandler, IToolReadOut, IColorCoded, INetworkFluidPart, IPacketReceiver

src/dark/fluid/common/pipes/TileEntityGenericPipe.java

@@ -8,7 +8,7 @@ import net.minecraftforge.fluids.FluidStack;
 import universalelectricity.core.vector.Vector3;
 import universalelectricity.core.vector.VectorHelper;
 import dark.core.interfaces.ColorCode;
-import dark.core.network.fluid.NetworkPipes;
+import dark.core.prefab.tilenetwork.fluid.NetworkPipes;
 
 public class TileEntityGenericPipe extends TileEntityPipe
 {

src/dark/fluid/common/pipes/TileEntityPipe.java

@@ -39,9 +39,9 @@ import dark.core.common.DarkMain;
 import dark.core.interfaces.ColorCode;
 import dark.core.interfaces.ColorCode.IColorCoded;
 import dark.core.network.PacketHandler;
-import dark.core.network.fluid.NetworkPipes;
 import dark.core.prefab.helpers.FluidHelper;
 import dark.core.prefab.tilenetwork.NetworkTileEntities;
+import dark.core.prefab.tilenetwork.fluid.NetworkPipes;
 import dark.fluid.common.pipes.addon.IPipeExtention;
 
 public class TileEntityPipe extends TileEntityAdvanced implements IFluidHandler, IToolReadOut, IColorCoded, INetworkPipe, IPacketReceiver

src/dark/fluid/common/prefab/TileEntityFluidDevice.java

@@ -7,7 +7,7 @@ import net.minecraftforge.common.ForgeDirection;
 import universalelectricity.prefab.tile.TileEntityAdvanced;
 import dark.api.IToolReadOut;
 import dark.api.parts.ITileConnector;
-import dark.core.network.fluid.FluidNetworkHelper;
+import dark.core.prefab.tilenetwork.fluid.FluidNetworkHelper;
 
 public abstract class TileEntityFluidDevice extends TileEntityAdvanced implements IToolReadOut, ITileConnector
 {

src/dark/fluid/common/pump/BlockConstructionPump.java

@@ -18,8 +18,8 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.core.network.fluid.FluidNetworkHelper;
 import dark.core.prefab.helpers.Pair;
+import dark.core.prefab.tilenetwork.fluid.FluidNetworkHelper;
 import dark.fluid.client.render.BlockRenderHelper;
 import dark.fluid.common.BlockFM;
 import dark.fluid.common.FluidMech;

src/dark/fluid/common/pump/TileEntityConstructionPump.java

@@ -18,10 +18,10 @@ import universalelectricity.core.vector.VectorHelper;
 import dark.api.fluid.IDrain;
 import dark.api.fluid.INetworkPipe;
 import dark.api.parts.ITileConnector;
-import dark.core.network.fluid.FluidNetworkHelper;
-import dark.core.network.fluid.NetworkFluidTiles;
 import dark.core.prefab.helpers.MetaGroup;
 import dark.core.prefab.helpers.Pair;
+import dark.core.prefab.tilenetwork.fluid.FluidNetworkHelper;
+import dark.core.prefab.tilenetwork.fluid.NetworkFluidTiles;
 
 public class TileEntityConstructionPump extends TileEntityStarterPump implements IFluidHandler, ITileConnector
 {