Starting to separate core from content

At some point in the near future the core will need to act as a library
more than a mod. Though it will still need to have its common items, and
blocks. Such as parts, and ores. Machines like the battery box, wire,
and generator will be moved to another mod.

bin/GitSync.bat

@@ -5,6 +5,7 @@ IF NOT "a%1"=="a" (set "com=%1")
 
 cd ..\
 git commit -am "%com%"
+git submodule foreach git pull origin master
 git push origin master
 cd ..\
 cd Assembly-Line

src/dark/api/DataPack.java

@@ -1,8 +1,6 @@
 package dark.api;
 
-import universalelectricity.core.electricity.ElectricityPack;
 import net.minecraft.nbt.NBTTagCompound;
-import dark.api.energy.EnergyPack;
 import dark.api.save.ISaveObj;
 import dark.api.save.NBTFileHelper;
 

src/dark/api/FluidMasterList.java

@@ -1,4 +1,4 @@
-package dark.api.fluid;
+package dark.api;
 
 import java.util.HashMap;
 

src/dark/api/access/Nodes.java

@@ -1,6 +1,5 @@
 package dark.api.access;
 
-import mffs.api.security.Permission;
 
 /** Constants that represent nodes by which machines and entities used in combination with
  * ISpecialAccess to limit users on what they can do. These nodes should be used in the same way by

src/dark/api/energy/IEnergyDevice.java

@@ -1,6 +1,6 @@
 package dark.api.energy;
 
-import dark.api.parts.ITileConnector;
+import dark.api.tilenetwork.ITileConnector;
 
 public interface IEnergyDevice extends ITileConnector
 {

src/dark/api/energy/IForceDevice.java

@@ -1,7 +1,7 @@
 package dark.api.energy;
 
 import net.minecraftforge.common.ForgeDirection;
-import dark.api.parts.ITileConnector;
+import dark.api.tilenetwork.ITileConnector;
 
 /** Think of this in the same way as an electrical device from UE. getforce methods are designed to
  * get the idea amount of force that a side should be outputting at the time. Apply force is the

src/dark/api/energy/IHeatObject.java

@@ -1,7 +1,7 @@
 package dark.api.energy;
 
 import net.minecraftforge.common.ForgeDirection;
-import dark.api.parts.ITileConnector;
+import dark.api.tilenetwork.ITileConnector;
 
 /** Used by TileEntities or Entities to show heat stored and cooling rate of the object
  * 

src/dark/api/energy/IPsiReciever.java

@@ -1,6 +1,6 @@
 package dark.api.energy;
 
-import dark.api.parts.ITileConnector;
+import dark.api.tilenetwork.ITileConnector;
 
 /** A tileEntity that receives a pressure driven fluid. Suggested to use some of the class from
  * net.minecraftforge.liquids too make your machine work with other fluid mods that don't use

src/dark/api/events/LaserEvent.java

@@ -20,8 +20,8 @@ import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.Cancelable;
 import net.minecraftforge.event.Event;
 import universalelectricity.core.vector.Vector3;
-import dark.core.common.items.EnumTool;
 import dark.core.helpers.ItemWorldHelper;
+import dark.machines.common.items.EnumTool;
 
 /** An event triggered by entities or tiles that create lasers
  * 

src/dark/api/reciepes/MachineRecipeHandler.java

@@ -16,11 +16,11 @@ import com.builtbroken.common.Pair;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import dark.api.ColorCode;
-import dark.core.common.CoreRecipeLoader;
-import dark.core.common.items.EnumMaterial;
-import dark.core.common.items.EnumOrePart;
-import dark.core.common.items.ItemOreDirv;
 import dark.core.helpers.AutoCraftingManager;
+import dark.machines.common.CoreRecipeLoader;
+import dark.machines.common.items.EnumMaterial;
+import dark.machines.common.items.EnumOrePart;
+import dark.machines.common.items.ItemOreDirv;
 
 /** Recipes for ore processor machines
  * 

src/dark/api/save/IVirtualObject.java

@@ -2,8 +2,6 @@ package dark.api.save;
 
 import java.io.File;
 
-import net.minecraft.nbt.NBTTagCompound;
-
 /** Used in combination with the save manager and other managers to say this object needs to be save
  * since its not connected with the world
  *

src/dark/api/tilenetwork/IMotionPath.java

@@ -1,8 +1,11 @@
-package dark.api.parts;
+package dark.api.tilenetwork;
 
 import net.minecraft.entity.Entity;
 import universalelectricity.core.vector.Vector3;
 
+/** Use by tiles to control the path of motion of an item threw a tile network such as items pipes
+ *
+ * @author DarkGuardsman */
 public interface IMotionPath
 {
 
@@ -13,7 +16,7 @@ public interface IMotionPath
      * the tile as the controller doesn't know the range of control of the tile. Though it does
      * limit itself to blocks around the entity. So if your tile only effects entities above it
      * within its bound then make sure the tile is inside those bounds
-     * 
+     *
      * @param entity - entity in question
      * @param from - direction the entity came from
      * @return true if it can, false if something is wrong like no power, or solid side */

src/dark/api/tilenetwork/INetworkContainer.java

@@ -1,4 +1,4 @@
-package dark.api.parts;
+package dark.api.tilenetwork;
 
 /** Used on tiles that can contain more than one tile network. Currently WIP so don't use unless you
  * know what your doing. When using this use networks like items and store them in slots.

src/dark/api/tilenetwork/INetworkEnergyPart.java

@@ -1,4 +1,4 @@
-package dark.api.parts;
+package dark.api.tilenetwork;
 
 import universalelectricity.core.block.IElectricalStorage;
 

src/dark/api/tilenetwork/INetworkHost.java

@@ -1,4 +1,4 @@
-package dark.api.parts;
+package dark.api.tilenetwork;
 
 import java.util.List;
 

src/dark/api/tilenetwork/INetworkPart.java

@@ -1,4 +1,4 @@
-package dark.api.parts;
+package dark.api.tilenetwork;
 
 import java.util.List;
 

src/dark/api/tilenetwork/ITileConnector.java

@@ -1,4 +1,4 @@
-package dark.api.parts;
+package dark.api.tilenetwork;
 
 import net.minecraftforge.common.ForgeDirection;
 

src/dark/api/tilenetwork/ITileNetwork.java

@@ -1,11 +1,11 @@
-package dark.api.parts;
+package dark.api.tilenetwork;
 
 import java.util.Set;
 
 import net.minecraft.tileentity.TileEntity;
 
-/** Applied to network entities that don't exist in the world but manage its tiles
+/** Applies to objects that act as a collection of tile entities.
- * 
+ *
  * @author DarkGuardsman */
 public interface ITileNetwork
 {
@@ -16,7 +16,7 @@ public interface ITileNetwork
     public Set<INetworkPart> getMembers();
 
     /** Called when something want the network to add the tile
-     * 
+     *
      * @param entity - tile in question
      * @param member - add it as a member if true
      * @return true if added without issue */

src/dark/core/BlockConfigFile.java

@@ -1,4 +1,4 @@
-package dark.core.registration;
+package dark.core;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/dark/core/BlockFluid.java

@@ -1,4 +1,4 @@
-package dark.core.registration;
+package dark.core;
 
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IconRegister;
@@ -8,8 +8,8 @@ import net.minecraftforge.fluids.BlockFluidFinite;
 import net.minecraftforge.fluids.Fluid;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.core.common.DarkMain;
 import dark.core.prefab.ModPrefab;
+import dark.machines.common.DarkMain;
 
 public class BlockFluid extends BlockFluidFinite
 {

src/dark/core/BlockTileEntityInfo.java

@@ -1,4 +1,4 @@
-package dark.core.registration;
+package dark.core;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/dark/core/ClientRegistryProxy.java

@@ -1,4 +1,4 @@
-package dark.core.registration;
+package dark.core;
 
 import java.util.ArrayList;
 import java.util.List;

src/dark/core/DarkCoreModContainer.java

@@ -15,7 +15,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.versioning.ArtifactVersion;
 import cpw.mods.fml.common.versioning.VersionParser;
 import cpw.mods.fml.common.versioning.VersionRange;
-import dark.core.common.DarkMain;
+import dark.machines.common.DarkMain;
 
 public class DarkCoreModContainer extends DummyModContainer
 {

src/dark/core/ModObjectRegistry.java

@@ -1,4 +1,4 @@
-package dark.core.registration;
+package dark.core;
 
 import java.io.File;
 import java.util.HashMap;
@@ -21,11 +21,11 @@ import com.builtbroken.common.Pair;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.SidedProxy;
 import cpw.mods.fml.common.registry.GameRegistry;
-import dark.core.common.DarkMain;
 import dark.core.interfaces.IExtraInfo;
 import dark.core.interfaces.IExtraInfo.IExtraBlockInfo;
 import dark.core.interfaces.IExtraInfo.IExtraItemInfo;
 import dark.core.prefab.machine.BlockMachine;
+import dark.machines.common.DarkMain;
 
 /** Handler to make registering all parts of a mod's objects that are loaded into the game by forge
  * 

src/dark/core/RegistryProxy.java

@@ -1,4 +1,4 @@
-package dark.core.registration;
+package dark.core;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemBlock;

src/dark/core/network/PacketManagerEffects.java

@@ -12,7 +12,7 @@ import universalelectricity.core.vector.Vector3;
 import com.google.common.io.ByteArrayDataInput;
 
 import cpw.mods.fml.common.network.Player;
-import dark.core.common.DarkMain;
+import dark.machines.common.DarkMain;
 
 public class PacketManagerEffects implements IPacketManager
 {

src/dark/core/network/PacketManagerEntity.java

@@ -12,7 +12,7 @@ import com.google.common.io.ByteArrayDataInput;
 
 import cpw.mods.fml.common.network.PacketDispatcher;
 import cpw.mods.fml.common.network.Player;
-import dark.core.common.DarkMain;
+import dark.machines.common.DarkMain;
 
 public class PacketManagerEntity implements IPacketManager
 {

src/dark/core/network/PacketManagerKeyEvent.java

@@ -11,8 +11,8 @@ import com.google.common.io.ByteArrayDataInput;
 
 import cpw.mods.fml.common.network.PacketDispatcher;
 import cpw.mods.fml.common.network.Player;
-import dark.core.common.DarkMain;
 import dark.core.interfaces.IControlReceiver;
+import dark.machines.common.DarkMain;
 
 public class PacketManagerKeyEvent implements IPacketManager
 {

src/dark/core/prefab/BlockColored.java

@@ -11,7 +11,7 @@ import net.minecraft.util.Icon;
 import net.minecraft.world.IBlockAccess;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.core.common.DarkMain;
+import dark.machines.common.DarkMain;
 
 /** Prefab class to make any block have 16 separate color instances similar to wool block
  * 

src/dark/core/prefab/ItemBasic.java

@@ -6,7 +6,7 @@ import net.minecraft.util.Icon;
 import net.minecraftforge.common.Configuration;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.core.common.DarkMain;
+import dark.machines.common.DarkMain;
 
 public class ItemBasic extends Item
 {

src/dark/core/prefab/ModPrefab.java

@@ -23,11 +23,11 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.registry.TickRegistry;
 import cpw.mods.fml.relauncher.Side;
 import dark.api.save.SaveManager;
-import dark.core.common.ExternalModHandler;
+import dark.core.ModObjectRegistry;
-import dark.core.common.PlayerKeyHandler;
 import dark.core.prefab.fluids.FluidHelper;
 import dark.core.prefab.tilenetwork.NetworkUpdateHandler;
-import dark.core.registration.ModObjectRegistry;
+import dark.machines.common.ExternalModHandler;
+import dark.machines.common.PlayerKeyHandler;
 
 public abstract class ModPrefab
 {

src/dark/core/prefab/entities/EntityTestCar.java

@@ -1,7 +1,7 @@
-package dark.core.prefab.vehicles;
+package dark.core.prefab.entities;
 
 import net.minecraft.world.World;
-import dark.core.common.CoreRecipeLoader;
+import dark.machines.common.CoreRecipeLoader;
 
 public class EntityTestCar extends EntityVehicle
 {

src/dark/core/prefab/entities/EntityVehicle.java

@@ -1,4 +1,4 @@
-package dark.core.prefab.vehicles;
+package dark.core.prefab.entities;
 
 import java.util.List;
 
@@ -16,12 +16,10 @@ import com.google.common.io.ByteArrayDataInput;
 
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.common.network.Player;
-import dark.core.helpers.MathHelper;
 import dark.core.interfaces.IControlReceiver;
 import dark.core.network.ISimplePacketReceiver;
 import dark.core.network.PacketManagerEntity;
 import dark.core.network.PacketManagerKeyEvent;
-import dark.core.prefab.entities.EntityAdvanced;
 
 public abstract class EntityVehicle extends EntityAdvanced implements IControlReceiver, ISimplePacketReceiver
 {

src/dark/core/prefab/entities/ItemVehicleSpawn.java

@@ -1,4 +1,4 @@
-package dark.core.prefab.vehicles;
+package dark.core.prefab.entities;
 
 import java.util.List;
 
@@ -12,10 +12,8 @@ import net.minecraft.util.EnumMovingObjectType;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
-import dark.core.common.DMCreativeTab;
-import dark.core.common.DarkMain;
-import dark.core.helpers.MathHelper;
 import dark.core.prefab.ModPrefab;
+import dark.machines.common.DMCreativeTab;
 
 /** Basic item used to spawn a vehicle
  * 

src/dark/core/prefab/invgui/GuiBar.java

@@ -10,7 +10,7 @@ import net.minecraft.util.ResourceLocation;
 import org.lwjgl.opengl.GL11;
 
 import universalelectricity.core.vector.Vector2;
-import dark.core.common.DarkMain;
+import dark.machines.common.DarkMain;
 
 /** When done should be a prefab that can be used to render a power bar on the screen
  * 

src/dark/core/prefab/invgui/GuiButtonArrow.java

@@ -8,7 +8,7 @@ import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.core.common.DarkMain;
+import dark.machines.common.DarkMain;
 
 @SideOnly(Side.CLIENT)
 public class GuiButtonArrow extends GuiButton

src/dark/core/prefab/invgui/GuiButtonImage.java

@@ -9,7 +9,7 @@ import org.lwjgl.opengl.GL11;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.core.common.DarkMain;
+import dark.machines.common.DarkMain;
 
 @SideOnly(Side.CLIENT)
 public class GuiButtonImage extends GuiButton

src/dark/core/prefab/invgui/GuiMessageBox.java

@@ -7,7 +7,7 @@ import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.common.FMLCommonHandler;
-import dark.core.common.DarkMain;
+import dark.machines.common.DarkMain;
 
 public class GuiMessageBox extends GuiBase
 {

src/dark/core/prefab/machine/BlockMachine.java

@@ -24,17 +24,17 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import dark.api.access.AccessUser;
 import dark.api.access.ISpecialAccess;
-import dark.api.parts.INetworkPart;
+import dark.api.tilenetwork.INetworkPart;
-import dark.core.common.DarkMain;
+import dark.core.ModObjectRegistry.BlockBuildData;
 import dark.core.interfaces.IBlockActivated;
 import dark.core.interfaces.IExtraInfo.IExtraBlockInfo;
 import dark.core.prefab.ModPrefab;
-import dark.core.registration.ModObjectRegistry.BlockBuildData;
+import dark.machines.common.DarkMain;
 
 /** Basic TileEntity Container class designed to be used by generic machines. It is suggested that
  * each mod using this create there own basic block extending this to reduce need to use build data
  * per block.
- * 
+ *
  * @author Darkguardsman */
 public abstract class BlockMachine extends BlockTile implements IExtraBlockInfo
 {

src/dark/core/prefab/machine/BlockMulti.java

@@ -21,9 +21,9 @@ import com.builtbroken.common.Pair;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.core.common.DarkMain;
 import dark.core.interfaces.IExtraInfo.IExtraBlockInfo;
 import dark.core.prefab.ModPrefab;
+import dark.machines.common.DarkMain;
 
 public class BlockMulti extends BlockContainer implements IExtraBlockInfo
 {

src/dark/core/prefab/machine/EnergyBank.java

@@ -1,10 +1,9 @@
 package dark.core.prefab.machine;
 
-import universalelectricity.core.block.IElectricalStorage;
-import universalelectricity.core.electricity.ElectricityPack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.common.ForgeDirection;
+import universalelectricity.core.block.IElectricalStorage;
+import universalelectricity.core.electricity.ElectricityPack;
 
 /** Basic energy bank class designed to remove most of the energy buffer code from a machine */
 public class EnergyBank implements IElectricalStorage

src/dark/core/prefab/machine/TileEntityEnergyMachine.java

@@ -16,12 +16,12 @@ import universalelectricity.core.grid.IElectricityNetwork;
 import universalelectricity.core.vector.Vector3;
 import universalelectricity.core.vector.VectorHelper;
 import dark.api.energy.IPowerLess;
-import dark.core.common.ExternalModHandler;
+import dark.machines.common.ExternalModHandler;
 
 /** Basic energy tile that can consume power
- * 
+ *
  * Based off both UE universal electrical tile, and electrical tile prefabs
- * 
+ *
  * @author DarkGuardsman */
 public abstract class TileEntityEnergyMachine extends TileEntityMachine implements IElectrical, IElectricalStorage, IPowerLess
 {
@@ -262,7 +262,7 @@ public abstract class TileEntityEnergyMachine extends TileEntityMachine implemen
     }
 
     /** The electrical input direction.
-     * 
+     *
      * @return The direction that electricity is entered into the tile. Return null for no input. By
      * default you can accept power from all sides. */
     public EnumSet<ForgeDirection> getInputDirections()
@@ -271,7 +271,7 @@ public abstract class TileEntityEnergyMachine extends TileEntityMachine implemen
     }
 
     /** The electrical output direction.
-     * 
+     *
      * @return The direction that electricity is output from the tile. Return null for no output. By
      * default it will return an empty EnumSet. */
     public EnumSet<ForgeDirection> getOutputDirections()

src/dark/core/prefab/machine/TileEntityInv.java

@@ -14,16 +14,16 @@ import universalelectricity.core.vector.Vector3;
 import universalelectricity.prefab.tile.TileEntityAdvanced;
 import dark.api.access.AccessGroup;
 import dark.api.access.AccessUser;
+import dark.api.access.GroupRegistry;
 import dark.api.access.ISpecialAccess;
 import dark.api.access.Nodes;
-import dark.api.access.GroupRegistry;
 import dark.core.interfaces.IExternalInv;
 import dark.core.interfaces.IInvBox;
 import dark.core.prefab.invgui.InvChest;
 import dark.core.prefab.tilenetwork.NetworkTileEntities;
 
 /** Prefab for simple object who only need basic inv support and nothing more
- * 
+ *
  * @author Darkguardsman */
 public class TileEntityInv extends TileEntityAdvanced implements IExternalInv, ISidedInventory, ISpecialAccess
 {

src/dark/core/prefab/machine/TileEntityMachine.java

@@ -17,12 +17,12 @@ import com.google.common.io.ByteArrayDataInput;
 import cpw.mods.fml.common.network.PacketDispatcher;
 import cpw.mods.fml.common.network.Player;
 import dark.api.IDisableable;
-import dark.core.common.DarkMain;
 import dark.core.interfaces.IExternalInv;
-import dark.core.interfaces.IExtraInfo.IExtraTileEntityInfo;
 import dark.core.interfaces.IInvBox;
+import dark.core.interfaces.IExtraInfo.IExtraTileEntityInfo;
 import dark.core.network.ISimplePacketReceiver;
 import dark.core.network.PacketHandler;
+import dark.machines.common.DarkMain;
 
 public abstract class TileEntityMachine extends TileEntityInv implements ISidedInventory, IExternalInv, IDisableable, ISimplePacketReceiver, IRotatable, IExtraTileEntityInfo
 {

src/dark/core/prefab/machine/TileEntityMulti.java

@@ -16,7 +16,7 @@ import dark.core.interfaces.IMultiBlock;
 import dark.core.network.PacketHandler;
 
 /** This is a multiblock to be used for blocks that are bigger than one block.
- * 
+ *
  * @author Calclavia */
 public class TileEntityMulti extends TileEntity implements IPacketReceiver
 {
@@ -118,7 +118,7 @@ public class TileEntityMulti extends TileEntity implements IPacketReceiver
     }
 
     /** Determines if this TileEntity requires update calls.
-     * 
+     *
      * @return True if you want updateEntity() to be called, false if not */
     @Override
     public boolean canUpdate()

src/dark/core/prefab/machine/TileEntityNBTContainer.java

@@ -5,7 +5,7 @@ import net.minecraft.tileentity.TileEntity;
 
 /** NBT Container blocks to use that don't really need a tileEntity for anything other than to record
  * a few values
- * 
+ *
  * @author DarkGuardsman */
 public class TileEntityNBTContainer extends TileEntity
 {

src/dark/core/prefab/sentry/BlockSentryGun.java

@@ -8,9 +8,9 @@ import net.minecraft.tileentity.TileEntity;
 
 import com.builtbroken.common.Pair;
 
-import dark.core.common.DarkMain;
+import dark.core.ModObjectRegistry;
 import dark.core.prefab.machine.BlockMachine;
-import dark.core.registration.ModObjectRegistry;
+import dark.machines.common.DarkMain;
 
 /** Actual block that is the sentry gun. Mainly a place holder as the sentry guns need something to
  * exist threw that is not an entity.

src/dark/core/prefab/sentry/BlockSentryPlatform.java

@@ -1,8 +1,8 @@
 package dark.core.prefab.sentry;
 
 import net.minecraft.block.material.Material;
-import dark.core.common.DarkMain;
 import dark.core.prefab.machine.BlockMachine;
+import dark.machines.common.DarkMain;
 
 /** Base platform for all sentry and turret's created to use for power, logic, and inventory
  * connections to the world.

src/dark/core/prefab/sentry/TileEntitySentry.java

@@ -16,12 +16,12 @@ import com.google.common.io.ByteArrayDataInput;
 
 import cpw.mods.fml.common.network.Player;
 import dark.api.ISentryGun;
-import dark.core.common.DarkMain;
 import dark.core.helpers.MathHelper;
 import dark.core.helpers.RayTraceHelper;
 import dark.core.network.PacketHandler;
 import dark.core.prefab.EntityTileDamage;
 import dark.core.prefab.machine.TileEntityMachine;
+import dark.machines.common.DarkMain;
 
 /** Prefab tileEntity for creating senty guns that can be of type aimed, mounted, or automated.
  * Contains most of the code for a sentry gun to operate short of aiming and operating logic. This

src/dark/core/prefab/terminal/ContainerTerminal.java

@@ -1,32 +0,0 @@
-package dark.core.prefab.terminal;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
-
-public abstract class ContainerTerminal extends Container
-{
-    private TileEntityTerminal tileEntity;
-
-    public ContainerTerminal(InventoryPlayer inventoryPlayer, TileEntityTerminal tileEntity)
-    {
-        this.tileEntity = tileEntity;
-    }
-
-    @Override
-    public void onContainerClosed(EntityPlayer par1EntityPlayer)
-    {
-        super.onContainerClosed(par1EntityPlayer);
-    }
-
-    @Override
-    public boolean canInteractWith(EntityPlayer par1EntityPlayer)
-    {
-        if (tileEntity instanceof IInventory)
-        {
-            return ((IInventory) this.tileEntity).isUseableByPlayer(par1EntityPlayer);
-        }
-        return true;
-    }
-}

src/dark/core/prefab/terminal/GlobalAccessManager.java

@@ -1,6 +0,0 @@
-package dark.core.prefab.terminal;
-
-public class GlobalAccessManager
-{
-
-}

src/dark/core/prefab/terminal/TileEntityTerminal.java

@@ -16,6 +16,7 @@ import dark.api.access.GroupRegistry;
 import dark.api.access.ITerminal;
 import dark.core.network.PacketHandler;
 import dark.core.prefab.machine.TileEntityEnergyMachine;
+import dark.core.prefab.machine.TileEntityMachine.SimplePacketTypes;
 
 /** @author Calclavia, DarkGuardsman */
 public abstract class TileEntityTerminal extends TileEntityEnergyMachine implements ITerminal

src/dark/core/prefab/tilenetwork/NetworkItemSupply.java

@@ -11,8 +11,8 @@ import universalelectricity.core.vector.Vector3;
 
 import com.builtbroken.common.Pair;
 
-import dark.api.parts.IMotionPath;
+import dark.api.tilenetwork.IMotionPath;
-import dark.api.parts.INetworkPart;
+import dark.api.tilenetwork.INetworkPart;
 
 /** Class that acts like the redpower pipes system. Each item is marked with a destination. Intended
  * use it to improve the assembly line network

src/dark/core/prefab/tilenetwork/NetworkPathFinder.java

@@ -8,7 +8,7 @@ import net.minecraft.world.World;
 import universalelectricity.core.path.IPathCallBack;
 import universalelectricity.core.path.Pathfinder;
 import universalelectricity.core.vector.Vector3;
-import dark.api.parts.INetworkPart;
+import dark.api.tilenetwork.INetworkPart;
 
 /** Check if a conductor connects with another. */
 public class NetworkPathFinder extends Pathfinder

src/dark/core/prefab/tilenetwork/NetworkResourceSupply.java

@@ -5,7 +5,7 @@ import java.util.List;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;
-import dark.api.parts.INetworkPart;
+import dark.api.tilenetwork.INetworkPart;
 
 /** Network that supplies resources to tiles that demand a set resource
  * 

src/dark/core/prefab/tilenetwork/NetworkSharedPower.java

@@ -4,8 +4,8 @@ import net.minecraft.tileentity.TileEntity;
 import universalelectricity.core.block.IElectricalStorage;
 import universalelectricity.core.electricity.ElectricityPack;
 import dark.api.energy.IPowerLess;
-import dark.api.parts.INetworkEnergyPart;
+import dark.api.tilenetwork.INetworkEnergyPart;
-import dark.api.parts.INetworkPart;
+import dark.api.tilenetwork.INetworkPart;
 
 /** Used for tile networks that only need to share power or act like a group battery that doesn't
  * store power on world save

src/dark/core/prefab/tilenetwork/NetworkTileEntities.java

@@ -10,8 +10,8 @@ import net.minecraftforge.common.ForgeDirection;
 import universalelectricity.core.path.Pathfinder;
 import universalelectricity.core.vector.Vector3;
 import universalelectricity.core.vector.VectorHelper;
-import dark.api.parts.INetworkPart;
+import dark.api.tilenetwork.INetworkPart;
-import dark.api.parts.ITileNetwork;
+import dark.api.tilenetwork.ITileNetwork;
 
 public class NetworkTileEntities implements ITileNetwork
 {

src/dark/core/prefab/tilenetwork/NetworkUpdateHandler.java

@@ -8,7 +8,7 @@ import java.util.Set;
 
 import cpw.mods.fml.common.ITickHandler;
 import cpw.mods.fml.common.TickType;
-import dark.api.parts.ITileNetwork;
+import dark.api.tilenetwork.ITileNetwork;
 
 /** Manages all the tile networks making sure they get world save events, and updates every so often
  * 

src/dark/machines/client/ClientProxy.java

@@ -1,4 +1,4 @@
-package dark.core.client;
+package dark.machines.client;
 
 import java.awt.Color;
 
@@ -12,15 +12,15 @@ import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.core.client.gui.GuiBatteryBox;
-import dark.core.client.renders.BlockRenderingHandler;
-import dark.core.client.renders.ItemRenderFluidCan;
-import dark.core.client.renders.RenderTestCar;
-import dark.core.common.CommonProxy;
-import dark.core.common.CoreRecipeLoader;
-import dark.core.common.machines.TileEntityBatteryBox;
 import dark.core.prefab.ModPrefab;
-import dark.core.prefab.vehicles.EntityTestCar;
+import dark.core.prefab.entities.EntityTestCar;
+import dark.machines.client.gui.GuiBatteryBox;
+import dark.machines.client.renders.BlockRenderingHandler;
+import dark.machines.client.renders.ItemRenderFluidCan;
+import dark.machines.client.renders.RenderTestCar;
+import dark.machines.common.CommonProxy;
+import dark.machines.common.CoreRecipeLoader;
+import dark.machines.common.machines.TileEntityBatteryBox;
 
 @SideOnly(Side.CLIENT)
 public class ClientProxy extends CommonProxy

src/dark/machines/client/Effects.java

@@ -1,4 +1,4 @@
-package dark.core.client;
+package dark.machines.client;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.util.Vec3;

src/dark/machines/client/FXBeam.java

@@ -1,4 +1,4 @@
-package dark.core.client;
+package dark.machines.client;
 
 import java.awt.Color;
 
@@ -16,7 +16,7 @@ import universalelectricity.core.vector.Vector3;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.core.common.DarkMain;
+import dark.machines.common.DarkMain;
 
 /** Based off Thaumcraft's Beam Renderer.
  * 

src/dark/machines/client/gui/GuiBatteryBox.java

@@ -1,4 +1,4 @@
-package dark.core.client.gui;
+package dark.machines.client.gui;
 
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -11,9 +11,9 @@ import universalelectricity.core.electricity.ElectricityDisplay;
 import universalelectricity.core.electricity.ElectricityDisplay.ElectricUnit;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.core.common.DarkMain;
+import dark.machines.common.DarkMain;
-import dark.core.common.machines.ContainerBatteryBox;
+import dark.machines.common.machines.ContainerBatteryBox;
-import dark.core.common.machines.TileEntityBatteryBox;
+import dark.machines.common.machines.TileEntityBatteryBox;
 
 @SideOnly(Side.CLIENT)
 public class GuiBatteryBox extends GuiContainer

src/dark/machines/client/gui/GuiInvMachineBase.java

@@ -1,4 +1,4 @@
-package dark.core.client.gui;
+package dark.machines.client.gui;
 
 /** Same as the GuiMachineBase but supports inventory pages
  * 

src/dark/machines/client/gui/GuiMachineBase.java

@@ -1,4 +1,4 @@
-package dark.core.client.gui;
+package dark.machines.client.gui;
 
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.renderer.RenderHelper;
@@ -9,11 +9,11 @@ import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
 import cpw.mods.fml.client.FMLClientHandler;
-import dark.core.common.DarkMain;
 import dark.core.prefab.invgui.GuiBase;
 import dark.core.prefab.invgui.GuiButtonImage;
 import dark.core.prefab.invgui.GuiButtonImage.ButtonIcon;
 import dark.core.prefab.machine.TileEntityMachine;
+import dark.machines.common.DarkMain;
 
 /** To be used with all machine that have a gui to allow generic settings and feature all all devices
  * 

src/dark/machines/client/gui/GuiMachineContainer.java

@@ -1,4 +1,4 @@
-package dark.core.client.gui;
+package dark.machines.client.gui;
 
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.inventory.GuiContainer;

src/dark/machines/client/models/ModelCopperWire.java

@@ -1,4 +1,4 @@
-package dark.core.client.models;
+package dark.machines.client.models;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;

src/dark/machines/client/models/ModelElecFurnace.java

@@ -4,9 +4,8 @@
 // Keep in mind that you still need to fill in some blanks
 // - ZeuX
 
-package dark.core.client.models;
+package dark.machines.client.models;
 
-import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 
 public class ModelElecFurnace extends ModelMachine

src/dark/machines/client/models/ModelMachine.java

@@ -1,4 +1,4 @@
-package dark.core.client.models;
+package dark.machines.client.models;
 
 import net.minecraft.client.model.ModelBase;
 

src/dark/machines/client/models/ModelSmallFluidCan.java

@@ -4,7 +4,7 @@
 // Keep in mind that you still need to fill in some blanks
 // - ZeuX
 
-package dark.core.client.models;
+package dark.machines.client.models;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;

src/dark/machines/client/models/ModelSolarPanel.java

@@ -4,7 +4,7 @@
 // Keep in mind that you still need to fill in some blanks
 // - ZeuX
 
-package dark.core.client.models;
+package dark.machines.client.models;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;

src/dark/machines/client/models/ModelSteamGen.java

@@ -4,7 +4,7 @@
 // Keep in mind that you still need to fill in some blanks
 // - ZeuX
 
-package dark.core.client.models;
+package dark.machines.client.models;
 
 import net.minecraft.client.model.ModelRenderer;
 

src/dark/machines/client/models/ModelSteamTurbine.java

@@ -4,11 +4,9 @@
 // Keep in mind that you still need to fill in some blanks
 // - ZeuX
 
-package dark.core.client.models;
+package dark.machines.client.models;
 
-import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
-import net.minecraft.entity.Entity;
 
 public class ModelSteamTurbine extends ModelMachine
 {

src/dark/machines/client/models/ModelTestCar.java

@@ -4,7 +4,7 @@
 // Keep in mind that you still need to fill in some blanks
 // - ZeuX
 
-package dark.core.client.models;
+package dark.machines.client.models;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;

src/dark/machines/client/renders/BlockRenderInfo.java

@@ -1,4 +1,4 @@
-package dark.core.client.renders;
+package dark.machines.client.renders;
 
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;

src/dark/machines/client/renders/BlockRenderingHandler.java

@@ -1,4 +1,4 @@
-package dark.core.client.renders;
+package dark.machines.client.renders;
 
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
@@ -12,11 +12,11 @@ import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.core.client.models.ModelMachine;
-import dark.core.client.models.ModelSolarPanel;
-import dark.core.common.CoreRecipeLoader;
-import dark.core.common.DarkMain;
 import dark.core.prefab.ModPrefab;
+import dark.machines.client.models.ModelMachine;
+import dark.machines.client.models.ModelSolarPanel;
+import dark.machines.common.CoreRecipeLoader;
+import dark.machines.common.DarkMain;
 
 @SideOnly(Side.CLIENT)
 public class BlockRenderingHandler implements ISimpleBlockRenderingHandler

src/dark/machines/client/renders/ItemRenderFluidCan.java

@@ -1,10 +1,9 @@
-package dark.core.client.renders;
+package dark.machines.client.renders;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.IItemRenderer;
-import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
 import org.lwjgl.opengl.GL11;
@@ -12,10 +11,10 @@ import org.lwjgl.opengl.GL11;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.core.client.models.ModelSmallFluidCan;
+import dark.machines.client.models.ModelSmallFluidCan;
-import dark.core.common.CoreRecipeLoader;
+import dark.machines.common.CoreRecipeLoader;
-import dark.core.common.DarkMain;
+import dark.machines.common.DarkMain;
-import dark.core.common.items.ItemFluidCan;
+import dark.machines.common.items.ItemFluidCan;
 
 @SideOnly(Side.CLIENT)
 public class ItemRenderFluidCan implements IItemRenderer

src/dark/machines/client/renders/RenderBlockEntity.java

@@ -1,4 +1,4 @@
-package dark.core.client.renders;
+package dark.machines.client.renders;
 
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.entity.Render;

src/dark/machines/client/renders/RenderBlockFluid.java

@@ -1,4 +1,4 @@
-package dark.core.client.renders;
+package dark.machines.client.renders;
 
 import java.util.HashMap;
 import java.util.Map;

src/dark/machines/client/renders/RenderBlockSolarPanel.java

@@ -1,4 +1,4 @@
-package dark.core.client.renders;
+package dark.machines.client.renders;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
@@ -7,8 +7,8 @@ import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.core.client.models.ModelSolarPanel;
+import dark.machines.client.models.ModelSolarPanel;
-import dark.core.common.DarkMain;
+import dark.machines.common.DarkMain;
 
 @SideOnly(Side.CLIENT)
 public class RenderBlockSolarPanel extends RenderTileMachine

src/dark/machines/client/renders/RenderBlockWire.java

@@ -1,4 +1,4 @@
-package dark.core.client.renders;
+package dark.machines.client.renders;
 
 import ic2.api.energy.tile.IEnergyAcceptor;
 import ic2.api.energy.tile.IEnergyTile;
@@ -15,8 +15,8 @@ import universalelectricity.core.vector.VectorHelper;
 import buildcraft.api.power.IPowerReceptor;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.core.client.models.ModelCopperWire;
+import dark.machines.client.models.ModelCopperWire;
-import dark.core.common.DarkMain;
+import dark.machines.common.DarkMain;
 
 @SideOnly(Side.CLIENT)
 public class RenderBlockWire extends RenderTileMachine

src/dark/machines/client/renders/RenderSteamGen.java

@@ -1,4 +1,4 @@
-package dark.core.client.renders;
+package dark.machines.client.renders;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MathHelper;
@@ -8,14 +8,12 @@ import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.core.client.models.ModelSteamGen;
-import dark.core.client.models.ModelSteamTurbine;
-import dark.core.client.models.ModelElecFurnace;
-import dark.core.client.models.ModelMachine;
-import dark.core.common.DarkMain;
-import dark.core.common.machines.BlockSmallSteamGen;
 import dark.core.prefab.ModPrefab;
 import dark.core.prefab.machine.TileEntityMachine;
+import dark.machines.client.models.ModelMachine;
+import dark.machines.client.models.ModelSteamGen;
+import dark.machines.client.models.ModelSteamTurbine;
+import dark.machines.common.DarkMain;
 
 @SideOnly(Side.CLIENT)
 public class RenderSteamGen extends RenderTileMachine

src/dark/machines/client/renders/RenderTestCar.java

@@ -1,4 +1,4 @@
-package dark.core.client.renders;
+package dark.machines.client.renders;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.renderer.entity.Render;
@@ -10,9 +10,9 @@ import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.core.client.models.ModelTestCar;
-import dark.core.common.DarkMain;
 import dark.core.prefab.entities.EntityAdvanced;
+import dark.machines.client.models.ModelTestCar;
+import dark.machines.common.DarkMain;
 
 @SideOnly(Side.CLIENT)
 public class RenderTestCar extends Render

src/dark/machines/client/renders/RenderTileMachine.java

@@ -1,4 +1,4 @@
-package dark.core.client.renders;
+package dark.machines.client.renders;
 
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;

src/dark/machines/common/CommonProxy.java

@@ -1,4 +1,4 @@
-package dark.core.common;
+package dark.machines.common;
 
 import java.awt.Color;
 
@@ -7,11 +7,11 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import universalelectricity.core.vector.Vector3;
 import cpw.mods.fml.common.network.IGuiHandler;
-import dark.core.common.machines.ContainerBatteryBox;
-import dark.core.common.machines.ContainerCoalGenerator;
-import dark.core.common.machines.TileEntityBatteryBox;
-import dark.core.common.machines.TileEntitySteamGen;
 import dark.core.network.PacketManagerEffects;
+import dark.machines.common.machines.ContainerBatteryBox;
+import dark.machines.common.machines.ContainerCoalGenerator;
+import dark.machines.common.machines.TileEntityBatteryBox;
+import dark.machines.common.machines.TileEntitySteamGen;
 
 public class CommonProxy implements IGuiHandler
 {

src/dark/machines/common/CoreRecipeLoader.java

@@ -1,4 +1,4 @@
-package dark.core.common;
+package dark.machines.common;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
@@ -10,20 +10,20 @@ import dark.api.ColorCode;
 import dark.api.IToolReadOut.EnumTools;
 import dark.api.reciepes.MachineRecipeHandler;
 import dark.api.reciepes.ProcessorType;
-import dark.core.common.blocks.BlockBasalt;
+import dark.machines.common.blocks.BlockBasalt;
-import dark.core.common.blocks.BlockOre;
+import dark.machines.common.blocks.BlockOre;
-import dark.core.common.blocks.BlockOre.OreData;
+import dark.machines.common.blocks.BlockOre.OreData;
-import dark.core.common.items.EnumMaterial;
+import dark.machines.common.items.EnumMaterial;
-import dark.core.common.items.EnumOrePart;
+import dark.machines.common.items.EnumOrePart;
-import dark.core.common.items.EnumTool;
+import dark.machines.common.items.EnumTool;
-import dark.core.common.items.ItemCommonTool;
+import dark.machines.common.items.ItemCommonTool;
-import dark.core.common.items.ItemOreDirv;
+import dark.machines.common.items.ItemOreDirv;
-import dark.core.common.items.ItemParts;
+import dark.machines.common.items.ItemParts;
-import dark.core.common.items.ItemParts.Parts;
+import dark.machines.common.items.ItemParts.Parts;
-import dark.core.common.items.ItemReadoutTools;
+import dark.machines.common.items.ItemReadoutTools;
-import dark.core.common.items.ItemWrench;
+import dark.machines.common.items.ItemWrench;
-import dark.core.common.machines.BlockSolarPanel;
+import dark.machines.common.machines.BlockSolarPanel;
-import dark.core.common.transmit.BlockWire;
+import dark.machines.common.transmit.BlockWire;
 
 public class CoreRecipeLoader extends RecipeLoader
 {

src/dark/machines/common/DMCreativeTab.java

@@ -1,4 +1,4 @@
-package dark.core.common;
+package dark.machines.common;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;

src/dark/machines/common/DarkMain.java

@@ -1,4 +1,4 @@
-package dark.core.common;
+package dark.machines.common;
 
 import java.awt.Color;
 import java.io.File;
@@ -34,44 +34,44 @@ import cpw.mods.fml.common.registry.EntityRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import dark.api.reciepes.MachineRecipeHandler;
-import dark.core.common.blocks.BlockBasalt;
+import dark.core.ModObjectRegistry;
-import dark.core.common.blocks.BlockColorGlass;
-import dark.core.common.blocks.BlockColorGlowGlass;
-import dark.core.common.blocks.BlockColorSand;
-import dark.core.common.blocks.BlockGasOre;
-import dark.core.common.blocks.BlockOre;
-import dark.core.common.blocks.BlockOre.OreData;
-import dark.core.common.blocks.GasOreGenerator;
-import dark.core.common.blocks.ItemBlockColored;
-import dark.core.common.blocks.ItemBlockOre;
-import dark.core.common.items.EnumMaterial;
-import dark.core.common.items.EnumOrePart;
-import dark.core.common.items.ItemBattery;
-import dark.core.common.items.ItemColoredDust;
-import dark.core.common.items.ItemCommonTool;
-import dark.core.common.items.ItemFluidCan;
-import dark.core.common.items.ItemOreDirv;
-import dark.core.common.items.ItemParts;
-import dark.core.common.items.ItemParts.Parts;
-import dark.core.common.items.ItemReadoutTools;
-import dark.core.common.items.ItemWrench;
-import dark.core.common.machines.BlockEnergyStorage;
-import dark.core.common.machines.BlockSmallSteamGen;
-import dark.core.common.machines.BlockDebug;
-import dark.core.common.machines.BlockSolarPanel;
-import dark.core.common.machines.ItemBlockEnergyStorage;
-import dark.core.common.transmit.BlockWire;
-import dark.core.common.transmit.ItemBlockWire;
 import dark.core.helpers.PacketDataWatcher;
 import dark.core.network.PacketHandler;
 import dark.core.prefab.ItemBlockHolder;
 import dark.core.prefab.ModPrefab;
+import dark.core.prefab.entities.EntityTestCar;
+import dark.core.prefab.entities.ItemVehicleSpawn;
 import dark.core.prefab.fluids.EnumGas;
 import dark.core.prefab.machine.BlockMulti;
 import dark.core.prefab.machine.TileEntityNBTContainer;
-import dark.core.prefab.vehicles.EntityTestCar;
+import dark.machines.common.blocks.BlockBasalt;
-import dark.core.prefab.vehicles.ItemVehicleSpawn;
+import dark.machines.common.blocks.BlockColorGlass;
-import dark.core.registration.ModObjectRegistry;
+import dark.machines.common.blocks.BlockColorGlowGlass;
+import dark.machines.common.blocks.BlockColorSand;
+import dark.machines.common.blocks.BlockGasOre;
+import dark.machines.common.blocks.BlockOre;
+import dark.machines.common.blocks.BlockOre.OreData;
+import dark.machines.common.blocks.GasOreGenerator;
+import dark.machines.common.blocks.ItemBlockColored;
+import dark.machines.common.blocks.ItemBlockOre;
+import dark.machines.common.items.EnumMaterial;
+import dark.machines.common.items.EnumOrePart;
+import dark.machines.common.items.ItemBattery;
+import dark.machines.common.items.ItemColoredDust;
+import dark.machines.common.items.ItemCommonTool;
+import dark.machines.common.items.ItemFluidCan;
+import dark.machines.common.items.ItemOreDirv;
+import dark.machines.common.items.ItemParts;
+import dark.machines.common.items.ItemParts.Parts;
+import dark.machines.common.items.ItemReadoutTools;
+import dark.machines.common.items.ItemWrench;
+import dark.machines.common.machines.BlockDebug;
+import dark.machines.common.machines.BlockEnergyStorage;
+import dark.machines.common.machines.BlockSmallSteamGen;
+import dark.machines.common.machines.BlockSolarPanel;
+import dark.machines.common.machines.ItemBlockEnergyStorage;
+import dark.machines.common.transmit.BlockWire;
+import dark.machines.common.transmit.ItemBlockWire;
 
 /** @author HangCow, DarkGuardsman */
 @Mod(modid = DarkMain.MOD_ID, name = DarkMain.MOD_NAME, version = DarkMain.VERSION, dependencies = "after:BuildCraft|Energy", useMetadata = true)

src/dark/machines/common/EntityTickHandler.java

@@ -1,4 +1,4 @@
-package dark.core.common;
+package dark.machines.common;
 
 import java.util.EnumSet;
 
@@ -10,7 +10,7 @@ import net.minecraft.world.WorldServer;
 import net.minecraftforge.common.DimensionManager;
 import cpw.mods.fml.common.ITickHandler;
 import cpw.mods.fml.common.TickType;
-import dark.core.common.blocks.BlockGasOre;
+import dark.machines.common.blocks.BlockGasOre;
 
 /** Tick handler that takes care of things like decreasing air supply while in gas block
  * 

src/dark/machines/common/ExternalModHandler.java

@@ -1,4 +1,4 @@
-package dark.core.common;
+package dark.machines.common;
 
 import net.minecraft.tileentity.TileEntity;
 import buildcraft.api.transport.IPipeTile;

src/dark/machines/common/PlayerKeyHandler.java

@@ -1,4 +1,4 @@
-package dark.core.common;
+package dark.machines.common;
 
 import java.util.EnumSet;
 

src/dark/machines/common/RecipeLoader.java

@@ -1,4 +1,4 @@
-package dark.core.common;
+package dark.machines.common;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;

src/dark/machines/common/blocks/BlockBasalt.java

@@ -1,4 +1,4 @@
-package dark.core.common.blocks;
+package dark.machines.common.blocks;
 
 import java.util.Random;
 
@@ -9,8 +9,8 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.util.Icon;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.core.common.DarkMain;
 import dark.core.prefab.ModPrefab;
+import dark.machines.common.DarkMain;
 
 public class BlockBasalt extends Block
 {

src/dark/machines/common/blocks/BlockColorGlass.java

@@ -1,4 +1,4 @@
-package dark.core.common.blocks;
+package dark.machines.common.blocks;
 
 import java.util.Random;
 
@@ -6,9 +6,9 @@ import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.core.common.DarkMain;
 import dark.core.prefab.BlockColored;
 import dark.core.prefab.ModPrefab;
+import dark.machines.common.DarkMain;
 
 public class BlockColorGlass extends BlockColored
 {

src/dark/machines/common/blocks/BlockColorGlowGlass.java

@@ -1,4 +1,4 @@
-package dark.core.common.blocks;
+package dark.machines.common.blocks;
 
 public class BlockColorGlowGlass extends BlockColorGlass
 {

src/dark/machines/common/blocks/BlockColorSand.java

@@ -1,4 +1,4 @@
-package dark.core.common.blocks;
+package dark.machines.common.blocks;
 
 import java.util.Random;
 
@@ -6,9 +6,9 @@ import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.world.World;
-import dark.core.common.DarkMain;
 import dark.core.prefab.BlockColored;
 import dark.core.prefab.ModPrefab;
+import dark.machines.common.DarkMain;
 
 //TODO fix instant falling sand
 public class BlockColorSand extends BlockColored

src/dark/machines/common/blocks/BlockGasOre.java

@@ -1,4 +1,4 @@
-package dark.core.common.blocks;
+package dark.machines.common.blocks;
 
 import java.awt.Color;
 import java.util.List;
@@ -23,10 +23,10 @@ import universalelectricity.core.vector.Vector3;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import dark.api.IGasBlock;
-import dark.core.common.DMCreativeTab;
-import dark.core.common.DarkMain;
 import dark.core.prefab.ModPrefab;
 import dark.core.prefab.fluids.EnumGas;
+import dark.machines.common.DMCreativeTab;
+import dark.machines.common.DarkMain;
 
 /** Gas that is designed to generate underground in the same way as an ore
  * 

src/dark/machines/common/blocks/BlockOre.java

@@ -1,4 +1,4 @@
-package dark.core.common.blocks;
+package dark.machines.common.blocks;
 
 import java.util.List;
 import java.util.Set;
@@ -20,11 +20,11 @@ import com.builtbroken.common.Pair;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.core.common.CoreRecipeLoader;
-import dark.core.common.DarkMain;
-import dark.core.common.items.EnumMaterial;
 import dark.core.interfaces.IExtraInfo.IExtraBlockInfo;
 import dark.core.prefab.ModPrefab;
+import dark.machines.common.CoreRecipeLoader;
+import dark.machines.common.DarkMain;
+import dark.machines.common.items.EnumMaterial;
 
 public class BlockOre extends Block implements IExtraBlockInfo
 {

src/dark/machines/common/blocks/GasOreGenerator.java

@@ -1,4 +1,4 @@
-package dark.core.common.blocks;
+package dark.machines.common.blocks;
 
 import java.util.Random;
 
@@ -10,7 +10,7 @@ import net.minecraft.world.gen.ChunkProviderEnd;
 import net.minecraft.world.gen.ChunkProviderHell;
 import net.minecraftforge.fluids.FluidStack;
 import cpw.mods.fml.common.IWorldGenerator;
-import dark.core.common.CoreRecipeLoader;
+import dark.machines.common.CoreRecipeLoader;
 
 public class GasOreGenerator implements IWorldGenerator
 {

src/dark/machines/common/blocks/ItemBlockBasalt.java

@@ -1,4 +1,4 @@
-package dark.core.common.blocks;
+package dark.machines.common.blocks;
 
 import java.util.List;
 

src/dark/machines/common/blocks/ItemBlockColored.java

@@ -1,9 +1,9 @@
-package dark.core.common.blocks;
+package dark.machines.common.blocks;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
-import dark.core.common.DarkMain;
+import dark.machines.common.DarkMain;
 
 public class ItemBlockColored extends ItemBlock
 {