Import changes

src/dark/api/fluid/INetworkFluidPart.java

@@ -4,7 +4,7 @@ import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
-import dark.api.parts.INetworkPart;
+import dark.api.tilenetwork.INetworkPart;
 
 /** Interface used by part that are members of a fluid tile network. Parts in the network will act as
  * one entity and will be controlled by the network. This means the network need the part to access

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

@@ -7,7 +7,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidHandler;
 import dark.api.fluid.INetworkFluidPart;
-import dark.api.parts.INetworkPart;
+import dark.api.tilenetwork.INetworkPart;
 import dark.core.prefab.fluids.FluidHelper;
 import dark.core.prefab.tilenetwork.NetworkUpdateHandler;
 

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

@@ -12,8 +12,8 @@ import net.minecraftforge.fluids.FluidTank;
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
 import dark.api.fluid.INetworkFluidPart;
-import dark.api.parts.INetworkPart;
-import dark.api.parts.ITileNetwork;
+import dark.api.tilenetwork.INetworkPart;
+import dark.api.tilenetwork.ITileNetwork;
 import dark.core.prefab.fluids.FluidHelper;
 import dark.core.prefab.tilenetwork.NetworkTileEntities;
 import dark.core.prefab.tilenetwork.NetworkUpdateHandler;

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

@@ -6,7 +6,7 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
 import dark.api.fluid.INetworkPipe;
-import dark.api.parts.INetworkPart;
+import dark.api.tilenetwork.INetworkPart;
 import dark.core.helpers.ConnectionHelper;
 import dark.core.prefab.fluids.FluidHelper;
 import dark.core.prefab.tilenetwork.NetworkUpdateHandler;

src/dark/fluid/client/render/RenderConstructionPump.java

@@ -7,11 +7,11 @@ import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.core.client.renders.RenderTileMachine;
 import dark.core.prefab.ModPrefab;
 import dark.fluid.client.model.ModelConstructionPump;
 import dark.fluid.common.FluidMech;
 import dark.fluid.common.pump.TileEntityConstructionPump;
+import dark.machines.client.renders.RenderTileMachine;
 
 @SideOnly(Side.CLIENT)
 public class RenderConstructionPump extends RenderTileMachine

src/dark/fluid/client/render/RenderFurnace.java

@@ -7,10 +7,10 @@ import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.core.client.renders.RenderTileMachine;
 import dark.core.prefab.ModPrefab;
 import dark.fluid.client.model.ModelFurnace;
 import dark.fluid.common.FluidMech;
+import dark.machines.client.renders.RenderTileMachine;
 
 @SideOnly(Side.CLIENT)
 public class RenderFurnace extends RenderTileMachine

src/dark/fluid/client/render/RenderGearPiston.java

@@ -7,10 +7,10 @@ import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.core.client.renders.RenderTileMachine;
 import dark.core.prefab.ModPrefab;
 import dark.fluid.client.model.ModelGearPiston;
 import dark.fluid.common.FluidMech;
+import dark.machines.client.renders.RenderTileMachine;
 import dark.mech.common.machines.TileEntitySteamPiston;
 
 @SideOnly(Side.CLIENT)

src/dark/fluid/client/render/RenderPipe.java

@@ -7,13 +7,13 @@ import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.core.client.renders.RenderTileMachine;
 import dark.core.prefab.ModPrefab;
 import dark.fluid.client.model.ModelLargePipe;
 import dark.fluid.common.FluidMech;
 import dark.fluid.common.FluidPartsMaterial;
 import dark.fluid.common.pipes.EnumPipeType;
 import dark.fluid.common.pipes.TileEntityPipe;
+import dark.machines.client.renders.RenderTileMachine;
 
 @SideOnly(Side.CLIENT)
 public class RenderPipe extends RenderTileMachine

src/dark/fluid/client/render/RenderPump.java

@@ -7,11 +7,11 @@ import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.core.client.renders.RenderTileMachine;
 import dark.core.prefab.ModPrefab;
 import dark.fluid.client.model.ModelPump;
 import dark.fluid.common.FluidMech;
 import dark.fluid.common.pump.TileEntityStarterPump;
+import dark.machines.client.renders.RenderTileMachine;
 
 @SideOnly(Side.CLIENT)
 public class RenderPump extends RenderTileMachine

src/dark/fluid/client/render/RenderReleaseValve.java

@@ -8,12 +8,12 @@ import org.lwjgl.opengl.GL11;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import dark.api.ColorCode;
-import dark.core.client.renders.RenderTileMachine;
 import dark.core.prefab.ModPrefab;
 import dark.fluid.client.model.ModelLargePipe;
 import dark.fluid.client.model.ModelReleaseValve;
 import dark.fluid.common.FluidMech;
 import dark.fluid.common.machines.TileEntityReleaseValve;
+import dark.machines.client.renders.RenderTileMachine;
 
 @SideOnly(Side.CLIENT)
 public class RenderReleaseValve extends RenderTileMachine

src/dark/fluid/client/render/RenderSink.java

@@ -8,11 +8,11 @@ import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.core.client.renders.RenderTileMachine;
 import dark.core.prefab.ModPrefab;
 import dark.fluid.client.model.ModelSink;
 import dark.fluid.common.FluidMech;
 import dark.fluid.common.machines.TileEntitySink;
+import dark.machines.client.renders.RenderTileMachine;
 
 @SideOnly(Side.CLIENT)
 public class RenderSink extends RenderTileMachine

src/dark/fluid/client/render/RenderTank.java

@@ -10,10 +10,10 @@ import org.lwjgl.opengl.GL11;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import dark.api.ColorCode;
-import dark.core.client.renders.RenderBlockFluid;
-import dark.core.client.renders.RenderTileMachine;
 import dark.fluid.client.model.ModelTankSide;
 import dark.fluid.common.machines.TileEntityTank;
+import dark.machines.client.renders.RenderBlockFluid;
+import dark.machines.client.renders.RenderTileMachine;
 
 @SideOnly(Side.CLIENT)
 public class RenderTank extends RenderTileMachine

src/dark/fluid/common/FMRecipeLoader.java

@@ -7,12 +7,12 @@ import net.minecraftforge.oredict.ShapedOreRecipe;
 import net.minecraftforge.oredict.ShapelessOreRecipe;
 import cpw.mods.fml.common.registry.GameRegistry;
 import dark.api.ColorCode;
-import dark.core.common.CoreRecipeLoader;
-import dark.core.common.RecipeLoader;
-import dark.core.common.items.EnumMaterial;
-import dark.core.common.items.EnumOrePart;
-import dark.core.common.items.ItemParts;
-import dark.core.common.items.ItemParts.Parts;
+import dark.machines.common.CoreRecipeLoader;
+import dark.machines.common.RecipeLoader;
+import dark.machines.common.items.EnumMaterial;
+import dark.machines.common.items.EnumOrePart;
+import dark.machines.common.items.ItemParts;
+import dark.machines.common.items.ItemParts.Parts;
 
 public class FMRecipeLoader extends RecipeLoader
 {

src/dark/fluid/common/FluidMech.java

@@ -21,11 +21,9 @@ import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.network.NetworkMod;
-import dark.core.common.DMCreativeTab;
-import dark.core.common.DarkMain;
+import dark.core.ModObjectRegistry;
 import dark.core.prefab.ItemBlockHolder;
 import dark.core.prefab.ModPrefab;
-import dark.core.registration.ModObjectRegistry;
 import dark.fluid.common.machines.BlockReleaseValve;
 import dark.fluid.common.machines.BlockSink;
 import dark.fluid.common.machines.BlockTank;
@@ -34,6 +32,8 @@ import dark.fluid.common.pipes.ItemBlockPipe;
 import dark.fluid.common.pump.BlockConstructionPump;
 import dark.fluid.common.pump.BlockDrain;
 import dark.fluid.common.pump.BlockPumpMachine;
+import dark.machines.common.DMCreativeTab;
+import dark.machines.common.DarkMain;
 
 @ModstatInfo(prefix = "fluidmech")
 @Mod(modid = FluidMech.MOD_ID, name = FluidMech.MOD_NAME, version = FluidMech.VERSION, dependencies = "after:DarkCore", useMetadata = true)

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

@@ -1,10 +1,10 @@
 package dark.fluid.common.machines;
 
 import net.minecraft.block.material.Material;
-import dark.core.common.DMCreativeTab;
+import dark.core.ModObjectRegistry.BlockBuildData;
 import dark.core.prefab.machine.BlockMachine;
-import dark.core.registration.ModObjectRegistry.BlockBuildData;
 import dark.fluid.common.FluidMech;
+import dark.machines.common.DMCreativeTab;
 
 public abstract class BlockFM extends BlockMachine
 {

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

@@ -15,7 +15,7 @@ import dark.api.ColorCode;
 import dark.api.ColorCode.IColorCoded;
 import dark.api.IToolReadOut;
 import dark.api.fluid.INetworkPipe;
-import dark.api.parts.ITileConnector;
+import dark.api.tilenetwork.ITileConnector;
 import dark.core.helpers.ConnectionHelper;
 import dark.core.prefab.tilenetwork.fluid.NetworkPipes;
 import dark.fluid.common.prefab.TileEntityFluidDevice;

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

@@ -15,9 +15,9 @@ import universalelectricity.prefab.network.IPacketReceiver;
 import com.google.common.io.ByteArrayDataInput;
 
 import dark.api.ColorCode;
-import dark.core.common.DarkMain;
 import dark.core.network.PacketHandler;
 import dark.fluid.common.prefab.TileEntityFluidStorage;
+import dark.machines.common.DarkMain;
 
 public class TileEntitySink extends TileEntityFluidStorage implements IPacketReceiver
 {

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

@@ -1,6 +1,6 @@
 package dark.fluid.common.machines;
 
-import dark.api.parts.ITileNetwork;
+import dark.api.tilenetwork.ITileNetwork;
 import dark.core.prefab.tilenetwork.fluid.NetworkFluidContainers;
 import dark.fluid.common.prefab.TileEntityFluidNetworkTile;
 

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

@@ -9,7 +9,7 @@ import universalelectricity.core.vector.Vector3;
 import dark.api.ColorCode;
 import dark.api.ColorCode.IColorCoded;
 import dark.api.fluid.INetworkPipe;
-import dark.api.parts.ITileNetwork;
+import dark.api.tilenetwork.ITileNetwork;
 import dark.core.prefab.tilenetwork.fluid.NetworkPipes;
 import dark.fluid.common.FluidPartsMaterial;
 import dark.fluid.common.prefab.TileEntityFluidNetworkTile;

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

@@ -6,7 +6,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraftforge.common.ForgeDirection;
 import universalelectricity.prefab.tile.TileEntityAdvanced;
 import dark.api.IToolReadOut;
-import dark.api.parts.ITileConnector;
+import dark.api.tilenetwork.ITileConnector;
 import dark.core.prefab.tilenetwork.NetworkTileEntities;
 
 public abstract class TileEntityFluidDevice extends TileEntityAdvanced implements IToolReadOut, ITileConnector

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

@@ -27,15 +27,15 @@ import com.google.common.io.ByteArrayDataInput;
 import cpw.mods.fml.common.network.Player;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.api.fluid.FluidMasterList;
+import dark.api.FluidMasterList;
 import dark.api.fluid.INetworkFluidPart;
-import dark.api.parts.INetworkPart;
-import dark.api.parts.ITileNetwork;
-import dark.core.common.DarkMain;
+import dark.api.tilenetwork.INetworkPart;
+import dark.api.tilenetwork.ITileNetwork;
 import dark.core.network.ISimplePacketReceiver;
 import dark.core.network.PacketHandler;
 import dark.core.prefab.tilenetwork.fluid.NetworkFluidTiles;
 import dark.fluid.common.FluidPartsMaterial;
+import dark.machines.common.DarkMain;
 
 public abstract class TileEntityFluidNetworkTile extends TileEntityFluidDevice implements INetworkFluidPart, ISimplePacketReceiver
 {

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

@@ -20,7 +20,7 @@ import com.builtbroken.common.Pair;
 
 import dark.api.fluid.IDrain;
 import dark.api.fluid.INetworkPipe;
-import dark.api.parts.ITileConnector;
+import dark.api.tilenetwork.ITileConnector;
 import dark.core.prefab.tilenetwork.fluid.NetworkFluidTiles;
 
 public class TileEntityConstructionPump extends TileEntityStarterPump implements IFluidHandler, ITileConnector

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

@@ -16,10 +16,10 @@ import com.builtbroken.common.Pair;
 
 import dark.api.IToolReadOut;
 import dark.api.fluid.IDrain;
-import dark.api.parts.ITileConnector;
-import dark.core.common.ExternalModHandler;
+import dark.api.tilenetwork.ITileConnector;
 import dark.core.prefab.fluids.FluidHelper;
 import dark.core.prefab.machine.TileEntityEnergyMachine;
+import dark.machines.common.ExternalModHandler;
 
 public class TileEntityStarterPump extends TileEntityEnergyMachine implements IToolReadOut, ITileConnector
 {