Package change from dark-> dark.core

Makes it easier for the build script to ID the core files when all the
CoreMachine mods are combined together

src/dark/core/client/ClientProxy.java

@@ -1,4 +1,4 @@
-package dark.client;
+package dark.core.client;
 
 import java.awt.Color;
 
@@ -8,11 +8,11 @@ import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.relauncher.Side;
-import dark.client.renders.RenderCopperWire;
-import dark.common.CommonProxy;
-import dark.common.CoreRecipeLoader;
-import dark.common.DarkMain;
-import dark.common.transmit.TileEntityWire;
+import dark.core.client.renders.RenderCopperWire;
+import dark.core.common.CommonProxy;
+import dark.core.common.CoreRecipeLoader;
+import dark.core.common.DarkMain;
+import dark.core.common.transmit.TileEntityWire;
 
 public class ClientProxy extends CommonProxy
 {

src/dark/core/client/FXBeam.java

@@ -1,4 +1,4 @@
-package dark.client;
+package dark.core.client;
 
 import java.awt.Color;
 
@@ -14,7 +14,7 @@ import org.lwjgl.opengl.GL11;
 
 import universalelectricity.core.vector.Vector3;
 import cpw.mods.fml.client.FMLClientHandler;
-import dark.common.DarkMain;
+import dark.core.common.DarkMain;
 
 /** Based off Thaumcraft's Beam Renderer.
  *

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

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

src/dark/core/client/renders/FluidBlockRenderer.java

@@ -1,4 +1,4 @@
-package dark.client.renders;
+package dark.core.client.renders;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -14,7 +14,7 @@ import net.minecraftforge.fluids.FluidStack;
 
 import org.lwjgl.opengl.GL11;
 
-import dark.prefab.helpers.BlockRenderInfo;
+import dark.core.prefab.helpers.BlockRenderInfo;
 
 import universalelectricity.core.vector.Vector3;
 

src/dark/core/client/renders/RenderCopperWire.java

@@ -1,4 +1,4 @@
-package dark.client.renders;
+package dark.core.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.client.models.ModelCopperWire;
-import dark.common.DarkMain;
+import dark.core.client.models.ModelCopperWire;
+import dark.core.common.DarkMain;
 
 @SideOnly(Side.CLIENT)
 public class RenderCopperWire extends RenderMachine

src/dark/core/client/renders/RenderFakeBlock.java

@@ -5,7 +5,7 @@
  * 1.0, or MMPL. Please check the contents of the license located in
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
-package dark.client.renders;
+package dark.core.client.renders;
 
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.Tessellator;
@@ -18,8 +18,8 @@ import net.minecraft.world.World;
 
 import org.lwjgl.opengl.GL11;
 
-import dark.prefab.helpers.BlockRenderInfo;
-import dark.prefab.helpers.EntityFakeBlock;
+import dark.core.prefab.helpers.BlockRenderInfo;
+import dark.core.prefab.helpers.EntityFakeBlock;
 
 import universalelectricity.core.vector.Vector3;
 

src/dark/core/client/renders/RenderMachine.java

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

src/dark/core/common/BlockRegistry.java

@@ -1,4 +1,4 @@
-package dark.common;
+package dark.core.common;
 
 import java.io.File;
 import java.util.HashMap;
@@ -13,8 +13,8 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.Configuration;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.registry.GameRegistry;
-import dark.prefab.IExtraObjectInfo;
-import dark.prefab.helpers.Pair;
+import dark.core.prefab.IExtraObjectInfo;
+import dark.core.prefab.helpers.Pair;
 
 /** Handler to make registering all parts of a block a bit easier
  *

src/dark/core/common/CommonProxy.java

@@ -1,4 +1,4 @@
-package dark.common;
+package dark.core.common;
 
 import java.awt.Color;
 

src/dark/core/common/CoreRecipeLoader.java

@@ -1,13 +1,13 @@
-package dark.common;
+package dark.core.common;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.FurnaceRecipes;
-import dark.common.items.EnumMeterials;
-import dark.common.items.EnumOreParts;
-import dark.common.items.ItemWrench;
-import dark.common.items.ItemParts.Parts;
+import dark.core.common.items.EnumMeterials;
+import dark.core.common.items.EnumOreParts;
+import dark.core.common.items.ItemWrench;
+import dark.core.common.items.ItemParts.Parts;
 
 public class CoreRecipeLoader extends RecipeLoader
 {

src/dark/core/common/DarkMain.java

@@ -1,4 +1,4 @@
-package dark.common;
+package dark.core.common;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -28,22 +28,22 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.event.FMLServerStoppingEvent;
 import cpw.mods.fml.common.network.NetworkMod;
-import dark.common.BlockRegistry.BlockData;
-import dark.common.blocks.BlockOre;
-import dark.common.debug.BlockDebug;
-import dark.common.items.EnumMeterials;
-import dark.common.items.ItemBattery;
-import dark.common.items.ItemBlockOre;
-import dark.common.items.ItemOreDirv;
-import dark.common.items.ItemParts;
-import dark.common.items.ItemParts.Parts;
-import dark.common.items.ItemTools;
-import dark.common.items.ItemWrench;
-import dark.common.transmit.BlockWire;
-import dark.prefab.BlockMulti;
-import dark.prefab.ModPrefab;
-import dark.prefab.TileEntityMulti;
-import dark.prefab.helpers.FluidHelper;
+import dark.core.common.BlockRegistry.BlockData;
+import dark.core.common.blocks.BlockOre;
+import dark.core.common.debug.BlockDebug;
+import dark.core.common.items.EnumMeterials;
+import dark.core.common.items.ItemBattery;
+import dark.core.common.items.ItemBlockOre;
+import dark.core.common.items.ItemOreDirv;
+import dark.core.common.items.ItemParts;
+import dark.core.common.items.ItemTools;
+import dark.core.common.items.ItemWrench;
+import dark.core.common.items.ItemParts.Parts;
+import dark.core.common.transmit.BlockWire;
+import dark.core.prefab.BlockMulti;
+import dark.core.prefab.ModPrefab;
+import dark.core.prefab.TileEntityMulti;
+import dark.core.prefab.helpers.FluidHelper;
 
 /** @author HangCow, DarkGuardsman */
 @Mod(modid = DarkMain.MOD_ID, name = DarkMain.MOD_NAME, version = DarkMain.VERSION, dependencies = "after:BuildCraft|Energy", useMetadata = true)

src/dark/core/common/RecipeLoader.java

@@ -1,4 +1,4 @@
-package dark.common;
+package dark.core.common;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
@@ -6,8 +6,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 import net.minecraftforge.oredict.ShapedOreRecipe;
 import cpw.mods.fml.common.registry.GameRegistry;
-import dark.prefab.helpers.Pair;
-import dark.prefab.helpers.Triple;
+import dark.core.prefab.helpers.Pair;
+import dark.core.prefab.helpers.Triple;
 
 public abstract class RecipeLoader
 {

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

@@ -1,4 +1,4 @@
-package dark.common.blocks;
+package dark.core.common.blocks;
 
 import java.util.HashMap;
 import java.util.List;
@@ -13,10 +13,10 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.Icon;
 import net.minecraftforge.common.Configuration;
 import net.minecraftforge.oredict.OreDictionary;
-import dark.common.DarkMain;
-import dark.common.items.EnumMeterials;
-import dark.prefab.IExtraObjectInfo;
-import dark.prefab.helpers.Pair;
+import dark.core.common.DarkMain;
+import dark.core.common.items.EnumMeterials;
+import dark.core.prefab.IExtraObjectInfo;
+import dark.core.prefab.helpers.Pair;
 
 public class BlockOre extends Block implements IExtraObjectInfo
 {

src/dark/core/common/blocks/OreGenSettings.java

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

src/dark/core/common/blocks/OreGenerator.java

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

src/dark/core/common/debug/BlockDebug.java

@@ -1,4 +1,4 @@
-package dark.common.debug;
+package dark.core.common.debug;
 
 import java.util.List;
 import java.util.Set;
@@ -15,10 +15,10 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.Icon;
 import net.minecraft.world.World;
 import net.minecraftforge.common.Configuration;
-import dark.common.DarkMain;
-import dark.prefab.BlockMachine;
-import dark.prefab.IExtraObjectInfo;
-import dark.prefab.helpers.Pair;
+import dark.core.common.DarkMain;
+import dark.core.prefab.BlockMachine;
+import dark.core.prefab.IExtraObjectInfo;
+import dark.core.prefab.helpers.Pair;
 
 public class BlockDebug extends BlockMachine implements IExtraObjectInfo
 {

src/dark/core/common/debug/TileEntityInfFluid.java

@@ -1,4 +1,4 @@
-package dark.common.debug;
+package dark.core.common.debug;
 
 import net.minecraft.tileentity.TileEntity;
 

src/dark/core/common/debug/TileEntityInfLoad.java

@@ -1,4 +1,4 @@
-package dark.common.debug;
+package dark.core.common.debug;
 
 import net.minecraftforge.common.ForgeDirection;
 import universalelectricity.compatibility.TileEntityUniversalElectrical;

src/dark/core/common/debug/TileEntityInfSupply.java

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

src/dark/core/common/debug/TileEntityVoid.java

@@ -1,4 +1,4 @@
-package dark.common.debug;
+package dark.core.common.debug;
 
 import java.util.HashMap;
 

src/dark/core/common/items/EnumMeterials.java

@@ -1,11 +1,11 @@
-package dark.common.items;
+package dark.core.common.items;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import net.minecraft.item.ItemStack;
 import universalelectricity.prefab.ore.OreGenReplaceStone;
-import dark.common.DarkMain;
+import dark.core.common.DarkMain;
 
 /** Class for storing materials, there icon names, sub items to be made from them or there sub ores
  * 

src/dark/core/common/items/EnumOreParts.java

@@ -1,4 +1,4 @@
-package dark.common.items;
+package dark.core.common.items;
 
 public enum EnumOreParts
 {

src/dark/core/common/items/ItemBattery.java

@@ -1,4 +1,4 @@
-package dark.common.items;
+package dark.core.common.items;
 
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.creativetab.CreativeTabs;
@@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack;
 import universalelectricity.core.item.ItemElectric;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.common.DarkMain;
+import dark.core.common.DarkMain;
 
 public class ItemBattery extends ItemElectric
 {

src/dark/core/common/items/ItemBlockOre.java

@@ -1,8 +1,8 @@
-package dark.common.items;
+package dark.core.common.items;
 
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
-import dark.common.DarkMain;
+import dark.core.common.DarkMain;
 
 public class ItemBlockOre extends ItemBlock
 {

src/dark/core/common/items/ItemOreDirv.java

@@ -1,4 +1,4 @@
-package dark.common.items;
+package dark.core.common.items;
 
 import java.util.List;
 
@@ -9,8 +9,8 @@ import net.minecraft.util.Icon;
 import net.minecraftforge.common.Configuration;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.common.DarkMain;
-import dark.prefab.items.ItemBasic;
+import dark.core.common.DarkMain;
+import dark.core.prefab.items.ItemBasic;
 
 /** A series of items that are derived from a basic ore block
  * 

src/dark/core/common/items/ItemParts.java

@@ -1,8 +1,8 @@
-package dark.common.items;
+package dark.core.common.items;
 
 import java.util.List;
 
-import dark.prefab.items.ItemBasic;
+import dark.core.prefab.items.ItemBasic;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;

src/dark/core/common/items/ItemTools.java

@@ -1,4 +1,4 @@
-package dark.common.items;
+package dark.core.common.items;
 
 import java.util.List;
 
@@ -20,11 +20,11 @@ import universalelectricity.core.block.IElectrical;
 import universalelectricity.core.block.IElectricalStorage;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.common.DarkMain;
-import dark.interfaces.IToolReadOut;
-import dark.interfaces.IToolReadOut.EnumTools;
-import dark.prefab.helpers.FluidHelper;
-import dark.prefab.items.ItemBasic;
+import dark.core.common.DarkMain;
+import dark.core.interfaces.IToolReadOut;
+import dark.core.interfaces.IToolReadOut.EnumTools;
+import dark.core.prefab.helpers.FluidHelper;
+import dark.core.prefab.items.ItemBasic;
 
 public class ItemTools extends ItemBasic
 {

src/dark/core/common/items/ItemWrench.java

@@ -1,4 +1,4 @@
-package dark.common.items;
+package dark.core.common.items;
 
 import net.minecraft.block.Block;
 import net.minecraft.creativetab.CreativeTabs;
@@ -8,8 +8,8 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.Configuration;
 import net.minecraftforge.common.ForgeDirection;
 import buildcraft.api.tools.IToolWrench;
-import dark.common.DarkMain;
-import dark.prefab.items.ItemBasic;
+import dark.core.common.DarkMain;
+import dark.core.prefab.items.ItemBasic;
 
 public class ItemWrench extends ItemBasic implements IToolWrench
 {

src/dark/core/common/transmit/BlockLaserEmitter.java

@@ -1,4 +1,4 @@
-package dark.common.transmit;
+package dark.core.common.transmit;
 
 import net.minecraft.block.material.Material;
 import universalelectricity.prefab.block.BlockAdvanced;

src/dark/core/common/transmit/BlockWire.java

@@ -1,4 +1,4 @@
-package dark.common.transmit;
+package dark.core.common.transmit;
 
 import java.util.List;
 import java.util.Map.Entry;
@@ -17,10 +17,10 @@ import net.minecraftforge.common.Configuration;
 import universalelectricity.core.block.IConductor;
 import universalelectricity.core.vector.Vector3;
 import universalelectricity.prefab.tile.TileEntityConductor;
-import dark.common.DarkMain;
-import dark.prefab.BlockMachine;
-import dark.prefab.IExtraObjectInfo;
-import dark.prefab.helpers.Pair;
+import dark.core.common.DarkMain;
+import dark.core.prefab.BlockMachine;
+import dark.core.prefab.IExtraObjectInfo;
+import dark.core.prefab.helpers.Pair;
 
 public class BlockWire extends BlockMachine implements IExtraObjectInfo
 {

src/dark/core/common/transmit/ItemBlockLaserEmitter.java

@@ -1,4 +1,4 @@
-package dark.common.transmit;
+package dark.core.common.transmit;
 
 import net.minecraft.item.ItemBlock;
 

src/dark/core/common/transmit/TileEntityLaserEmitter.java

@@ -1,8 +1,8 @@
-package dark.common.transmit;
+package dark.core.common.transmit;
 
 import net.minecraftforge.common.ForgeDirection;
-import dark.common.DarkMain;
-import dark.prefab.TileEntityMachine;
+import dark.core.common.DarkMain;
+import dark.core.prefab.TileEntityMachine;
 
 public class TileEntityLaserEmitter extends TileEntityMachine
 {

src/dark/core/common/transmit/TileEntityWire.java

@@ -1,4 +1,4 @@
-package dark.common.transmit;
+package dark.core.common.transmit;
 
 import universalelectricity.compatibility.TileEntityUniversalConductor;
 

src/dark/core/interfaces/ColorCode.java

@@ -1,4 +1,4 @@
-package dark.interfaces;
+package dark.core.interfaces;
 
 public enum ColorCode
 {

src/dark/core/interfaces/IBlockActivate.java

@@ -1,4 +1,4 @@
-package dark.interfaces;
+package dark.core.interfaces;
 
 import net.minecraft.entity.player.EntityPlayer;
 

src/dark/core/interfaces/IDisableable.java

@@ -1,4 +1,4 @@
-package dark.interfaces;
+package dark.core.interfaces;
 
 /** This class should be applied to all tile entities (mainly machines) that can be disabled (by
  * things like EMP, short circuit etc.).

src/dark/core/interfaces/IExternalInv.java

@@ -1,4 +1,4 @@
-package dark.interfaces;
+package dark.core.interfaces;
 
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;

src/dark/core/interfaces/IHeatObject.java

@@ -1,4 +1,4 @@
-package dark.interfaces;
+package dark.core.interfaces;
 
 import net.minecraftforge.common.ForgeDirection;
 

src/dark/core/interfaces/IHeatProducer.java

@@ -1,4 +1,4 @@
-package dark.interfaces;
+package dark.core.interfaces;
 
 import net.minecraftforge.common.ForgeDirection;
 

src/dark/core/interfaces/IInvBox.java

@@ -1,4 +1,4 @@
-package dark.interfaces;
+package dark.core.interfaces;
 
 import net.minecraft.inventory.ISidedInventory;
 import net.minecraft.item.ItemStack;

src/dark/core/interfaces/INetworkEnergyPart.java

@@ -1,4 +1,4 @@
-package dark.interfaces;
+package dark.core.interfaces;
 
 import universalelectricity.core.block.IElectricalStorage;
 

src/dark/core/interfaces/INetworkPart.java

@@ -1,9 +1,9 @@
-package dark.interfaces;
+package dark.core.interfaces;
 
 import java.util.List;
 
 import net.minecraft.tileentity.TileEntity;
-import dark.prefab.tilenetwork.NetworkTileEntities;
+import dark.core.prefab.tilenetwork.NetworkTileEntities;
 
 public interface INetworkPart extends ITileConnector
 {

src/dark/core/interfaces/IPowerLess.java

@@ -1,4 +1,4 @@
-package dark.interfaces;
+package dark.core.interfaces;
 
 public interface IPowerLess
 {

src/dark/core/interfaces/IPsiReciever.java

@@ -1,4 +1,4 @@
-package dark.interfaces;
+package dark.core.interfaces;
 
 /** 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/core/interfaces/IScroll.java

@@ -1,4 +1,4 @@
-package dark.interfaces;
+package dark.core.interfaces;
 
 public interface IScroll
 {

src/dark/core/interfaces/ISpecialAccess.java

@@ -1,9 +1,9 @@
-package dark.interfaces;
+package dark.core.interfaces;
 
 import java.util.List;
 
-import dark.prefab.access.AccessLevel;
-import dark.prefab.access.UserAccess;
+import dark.core.prefab.access.AccessLevel;
+import dark.core.prefab.access.UserAccess;
 
 /** Used by any object that needs to restrict access to it by a set of usernames
  * 

src/dark/core/interfaces/ITerminal.java

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

src/dark/core/interfaces/ITileConnector.java

@@ -1,4 +1,4 @@
-package dark.interfaces;
+package dark.core.interfaces;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;

src/dark/core/interfaces/IToolReadOut.java

@@ -1,6 +1,6 @@
-package dark.interfaces;
+package dark.core.interfaces;
 
-import dark.interfaces.IToolReadOut.EnumTools;
+import dark.core.interfaces.IToolReadOut.EnumTools;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraftforge.common.ForgeDirection;
 

src/dark/core/interfaces/PowerSystems.java

@@ -1,4 +1,4 @@
-package dark.interfaces;
+package dark.core.interfaces;
 
 import cpw.mods.fml.common.Loader;
 

src/dark/core/prefab/BlockMachine.java

@@ -1,4 +1,4 @@
-package dark.prefab;
+package dark.core.prefab;
 
 import net.minecraft.block.ITileEntityProvider;
 import net.minecraft.block.material.Material;
@@ -10,8 +10,8 @@ import net.minecraftforge.common.Configuration;
 import universalelectricity.prefab.block.BlockTile;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.common.DarkMain;
-import dark.interfaces.INetworkPart;
+import dark.core.common.DarkMain;
+import dark.core.interfaces.INetworkPart;
 
 /** 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 input config

src/dark/core/prefab/BlockMulti.java

@@ -1,4 +1,4 @@
-package dark.prefab;
+package dark.core.prefab;
 
 import java.util.Random;
 

src/dark/core/prefab/IExtraObjectInfo.java

@@ -1,10 +1,10 @@
-package dark.prefab;
+package dark.core.prefab;
 
 import java.util.Set;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.Configuration;
-import dark.prefab.helpers.Pair;
+import dark.core.prefab.helpers.Pair;
 
 /** Used to handle info about the block that would normally be handled by the mod main class. Use the
  * BlockRegistry in order for these methods to be called on load of the mod.

src/dark/core/prefab/IMultiBlock.java

@@ -1,8 +1,8 @@
-package dark.prefab;
+package dark.core.prefab;
 
 import net.minecraft.tileentity.TileEntity;
 import universalelectricity.core.vector.Vector3;
-import dark.interfaces.IBlockActivate;
+import dark.core.interfaces.IBlockActivate;
 
 /** Interface to be applied to tile entity blocks that occupies more than one block space. Useful for
  * large machines.

src/dark/core/prefab/ModPrefab.java

@@ -1,4 +1,4 @@
-package dark.prefab;
+package dark.core.prefab;
 
 import java.util.List;
 
@@ -12,8 +12,8 @@ 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.relauncher.Side;
-import dark.common.BlockRegistry;
-import dark.common.BlockRegistry.BlockData;
+import dark.core.common.BlockRegistry;
+import dark.core.common.BlockRegistry.BlockData;
 
 public abstract class ModPrefab
 {

src/dark/core/prefab/TileEntityInv.java

@@ -1,4 +1,4 @@
-package dark.prefab;
+package dark.core.prefab;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.ISidedInventory;
@@ -6,9 +6,9 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.ForgeDirection;
 import universalelectricity.prefab.tile.TileEntityAdvanced;
-import dark.interfaces.IExternalInv;
-import dark.interfaces.IInvBox;
-import dark.prefab.invgui.InvChest;
+import dark.core.interfaces.IExternalInv;
+import dark.core.interfaces.IInvBox;
+import dark.core.prefab.invgui.InvChest;
 
 /** Prefab for simple object who only need basic inv support and nothing more
  *

src/dark/core/prefab/TileEntityMachine.java

@@ -1,4 +1,4 @@
-package dark.prefab;
+package dark.core.prefab;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
@@ -23,12 +23,12 @@ import com.google.common.io.ByteArrayDataInput;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.interfaces.IDisableable;
-import dark.interfaces.IExternalInv;
-import dark.interfaces.IInvBox;
-import dark.interfaces.IPowerLess;
-import dark.interfaces.PowerSystems;
-import dark.prefab.invgui.InvChest;
+import dark.core.interfaces.IDisableable;
+import dark.core.interfaces.IExternalInv;
+import dark.core.interfaces.IInvBox;
+import dark.core.interfaces.IPowerLess;
+import dark.core.interfaces.PowerSystems;
+import dark.core.prefab.invgui.InvChest;
 
 /** Prefab for most machines in the CoreMachine set. Provides basic power updates, packet updates,
  * inventory handling, and other handy methods.

src/dark/core/prefab/TileEntityMulti.java

@@ -1,4 +1,4 @@
-package dark.prefab;
+package dark.core.prefab;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;

src/dark/core/prefab/access/AccessLevel.java

@@ -1,4 +1,4 @@
-package dark.prefab.access;
+package dark.core.prefab.access;
 
 public enum AccessLevel
 {

src/dark/core/prefab/access/GlobalAccess.java

@@ -1,4 +1,4 @@
-package dark.prefab.access;
+package dark.core.prefab.access;
 
 public class GlobalAccess
 {

src/dark/core/prefab/access/GlobalAccessLoader.java

@@ -1,4 +1,4 @@
-package dark.prefab.access;
+package dark.core.prefab.access;
 
 import net.minecraftforge.common.MinecraftForge;
 import cpw.mods.fml.common.Mod.ServerStarting;

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

@@ -1,4 +1,4 @@
-package dark.prefab.access;
+package dark.core.prefab.access;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -8,7 +8,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 import net.minecraft.nbt.NBTTagCompound;
-import dark.prefab.helpers.NBTFileLoader;
+import dark.core.prefab.helpers.NBTFileLoader;
 
 public class GlobalAccessManager
 {

src/dark/core/prefab/access/UserAccess.java

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

src/dark/core/prefab/damage/EntityTileDamage.java

@@ -1,4 +1,4 @@
-package dark.prefab.damage;
+package dark.core.prefab.damage;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;

src/dark/core/prefab/damage/IHpTile.java

@@ -1,4 +1,4 @@
-package dark.prefab.damage;
+package dark.core.prefab.damage;
 
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.DamageSource;

src/dark/core/prefab/damage/TileDamageSource.java

@@ -1,4 +1,4 @@
-package dark.prefab.damage;
+package dark.core.prefab.damage;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLiving;

src/dark/core/prefab/helpers/AutoCraftingManager.java

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

src/dark/core/prefab/helpers/BlockRenderInfo.java

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

src/dark/core/prefab/helpers/ConnectionHelper.java

@@ -1,4 +1,4 @@
-package dark.prefab.helpers;
+package dark.core.prefab.helpers;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;

src/dark/core/prefab/helpers/Direction.java

@@ -1,4 +1,4 @@
-package dark.prefab.helpers;
+package dark.core.prefab.helpers;
 
 import universalelectricity.core.vector.Vector3;
 

src/dark/core/prefab/helpers/EntityFakeBlock.java

@@ -1,4 +1,4 @@
-package dark.prefab.helpers;
+package dark.core.prefab.helpers;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.nbt.NBTTagCompound;

src/dark/core/prefab/helpers/FluidHelper.java

@@ -1,4 +1,4 @@
-package dark.prefab.helpers;
+package dark.core.prefab.helpers;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -9,7 +9,7 @@ import java.util.Map.Entry;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 
-import dark.interfaces.ColorCode;
+import dark.core.interfaces.ColorCode;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockFluid;

src/dark/core/prefab/helpers/ItemWorldHelper.java

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

src/dark/core/prefab/helpers/MathHelper.java

@@ -1,4 +1,4 @@
-package dark.prefab.helpers;
+package dark.core.prefab.helpers;
 
 import java.util.Random;
 

src/dark/core/prefab/helpers/MetaGroup.java

@@ -1,4 +1,4 @@
-package dark.prefab.helpers;
+package dark.core.prefab.helpers;
 
 /** Used by machines that only rotate to 4 directions
  * 

src/dark/core/prefab/helpers/NBTFileLoader.java

@@ -1,4 +1,4 @@
-package dark.prefab.helpers;
+package dark.core.prefab.helpers;
 
 import java.io.File;
 import java.io.FileInputStream;

src/dark/core/prefab/helpers/Pair.java

@@ -1,4 +1,4 @@
-package dark.prefab.helpers;
+package dark.core.prefab.helpers;
 
 public class Pair<L, R>
 {

src/dark/core/prefab/helpers/PlayerMsgHelper.java

@@ -1,4 +1,4 @@
-package dark.prefab.helpers;
+package dark.core.prefab.helpers;
 
 import java.util.Iterator;
 import java.util.List;

src/dark/core/prefab/helpers/Quaternion.java

@@ -1,4 +1,4 @@
-package dark.prefab.helpers;
+package dark.core.prefab.helpers;
 
 import universalelectricity.core.vector.Vector3;
 

src/dark/core/prefab/helpers/Time.java

@@ -1,4 +1,4 @@
-package dark.prefab.helpers;
+package dark.core.prefab.helpers;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

src/dark/core/prefab/helpers/Triple.java

@@ -1,4 +1,4 @@
-package dark.prefab.helpers;
+package dark.core.prefab.helpers;
 
 public class Triple<A, B, C>
 {

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

@@ -1,4 +1,4 @@
-package dark.prefab.invgui;
+package dark.core.prefab.invgui;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;

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

@@ -1,4 +1,4 @@
-package dark.prefab.invgui;
+package dark.core.prefab.invgui;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
@@ -8,7 +8,7 @@ import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.common.DarkMain;
+import dark.core.common.DarkMain;
 
 @SideOnly(Side.CLIENT)
 public class GuiButtonArrow extends GuiButton

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

@@ -1,4 +1,4 @@
-package dark.prefab.invgui;
+package dark.core.prefab.invgui;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -19,9 +19,9 @@ import universalelectricity.core.vector.Vector2;
 import universalelectricity.prefab.vector.Region2;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.common.DarkMain;
-import dark.interfaces.IScroll;
-import dark.prefab.access.UserAccess;
+import dark.core.common.DarkMain;
+import dark.core.interfaces.IScroll;
+import dark.core.prefab.access.UserAccess;
 
 @SideOnly(Side.CLIENT)
 public class GuiGlobalList extends GuiContainer implements IScroll

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

@@ -1,4 +1,4 @@
-package dark.prefab.invgui;
+package dark.core.prefab.invgui;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;

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

@@ -1,4 +1,4 @@
-package dark.prefab.invgui;
+package dark.core.prefab.invgui;
 
 /** Add this to a container class if using WatchedSlot to trigger the container on slot change */
 public interface ISlotWatcher

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

@@ -1,4 +1,4 @@
-package dark.prefab.invgui;
+package dark.core.prefab.invgui;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -6,8 +6,8 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;
-import dark.interfaces.IExternalInv;
-import dark.interfaces.IInvBox;
+import dark.core.interfaces.IExternalInv;
+import dark.core.interfaces.IInvBox;
 
 public class InvChest implements IInvBox
 {

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

@@ -1,4 +1,4 @@
-package dark.prefab.invgui;
+package dark.core.prefab.invgui;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;

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

@@ -1,4 +1,4 @@
-package dark.prefab.invgui;
+package dark.core.prefab.invgui;
 
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;

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

@@ -1,4 +1,4 @@
-package dark.prefab.invgui;
+package dark.core.prefab.invgui;
 
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;

src/dark/core/prefab/items/ItemBasic.java

@@ -1,4 +1,4 @@
-package dark.prefab.items;
+package dark.core.prefab.items;
 
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.item.Item;
@@ -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.common.DarkMain;
+import dark.core.common.DarkMain;
 
 public class ItemBasic extends Item
 {

src/dark/core/prefab/items/ItemBlockHolder.java

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

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

@@ -1,11 +1,11 @@
-package dark.prefab.terminal;
+package dark.core.prefab.terminal;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import net.minecraft.entity.player.EntityPlayer;
-import dark.interfaces.ISpecialAccess;
-import dark.interfaces.ITerminal;
+import dark.core.interfaces.ISpecialAccess;
+import dark.core.interfaces.ITerminal;
 
 public class CommandHelp extends TerminalCommand
 {

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

@@ -1,10 +1,10 @@
-package dark.prefab.terminal;
+package dark.core.prefab.terminal;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import net.minecraft.entity.player.EntityPlayer;
-import dark.interfaces.ITerminal;
+import dark.core.interfaces.ITerminal;
 
 /** @author Calclavia, DarkGuardsman */
 public class CommandRegistry

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

@@ -1,12 +1,12 @@
-package dark.prefab.terminal;
+package dark.core.prefab.terminal;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import net.minecraft.entity.player.EntityPlayer;
-import dark.interfaces.ISpecialAccess;
-import dark.interfaces.ITerminal;
-import dark.prefab.access.AccessLevel;
+import dark.core.interfaces.ISpecialAccess;
+import dark.core.interfaces.ITerminal;
+import dark.core.prefab.access.AccessLevel;
 
 public class CommandUser extends TerminalCommand
 {

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

@@ -1,4 +1,4 @@
-package dark.prefab.terminal;
+package dark.core.prefab.terminal;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;

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

@@ -1,10 +1,10 @@
-package dark.prefab.terminal;
+package dark.core.prefab.terminal;
 
 import java.util.List;
 
 import net.minecraft.entity.player.EntityPlayer;
-import dark.interfaces.ISpecialAccess;
-import dark.interfaces.ITerminal;
+import dark.core.interfaces.ISpecialAccess;
+import dark.core.interfaces.ITerminal;
 
 /** @author Calclavia, DarkGuardsman */
 public abstract class TerminalCommand

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

@@ -1,4 +1,4 @@
-package dark.prefab.terminal;
+package dark.core.prefab.terminal;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -20,11 +20,11 @@ import com.google.common.io.ByteArrayDataInput;
 import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.network.PacketDispatcher;
 import cpw.mods.fml.common.network.Player;
-import dark.interfaces.ISpecialAccess;
-import dark.interfaces.ITerminal;
-import dark.prefab.TileEntityMachine;
-import dark.prefab.access.AccessLevel;
-import dark.prefab.access.UserAccess;
+import dark.core.interfaces.ISpecialAccess;
+import dark.core.interfaces.ITerminal;
+import dark.core.prefab.TileEntityMachine;
+import dark.core.prefab.access.AccessLevel;
+import dark.core.prefab.access.UserAccess;
 
 /** @author Calclavia, DarkGuardsman */
 public abstract class TileEntityTerminal extends TileEntityMachine implements ISpecialAccess, IPacketReceiver, ITerminal

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

@@ -1,4 +1,4 @@
-package dark.prefab.tilenetwork;
+package dark.core.prefab.tilenetwork;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -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.interfaces.INetworkPart;
+import dark.core.interfaces.INetworkPart;
 
 /** Check if a conductor connects with another. */
 public class NetworkPathFinder extends Pathfinder

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

@@ -1,4 +1,4 @@
-package dark.prefab.tilenetwork;
+package dark.core.prefab.tilenetwork;
 
 public class NetworkPowerWires
 {