Moved files around

The ammount of files in this project are getting out of hand tbh. I will
need to sit down later and sort them all out and remove any that are not
needed.

src/dark/common/debug/BlockDebug.java

@@ -14,7 +14,7 @@ import net.minecraft.util.Icon;
 import net.minecraft.world.World;
 import net.minecraftforge.common.Configuration;
 import dark.core.DarkMain;
-import dark.core.blocks.BlockMachine;
+import dark.prefab.BlockMachine;
 
 public class BlockDebug extends BlockMachine
 {

src/dark/common/transmit/BlockWire.java

@@ -16,7 +16,7 @@ import universalelectricity.core.block.IConductor;
 import universalelectricity.core.vector.Vector3;
 import universalelectricity.prefab.tile.TileEntityConductor;
 import dark.core.DarkMain;
-import dark.core.blocks.BlockMachine;
+import dark.prefab.BlockMachine;
 
 public class BlockWire extends BlockMachine
 {

src/dark/common/transmit/TileEntityLaserEmitter.java

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

src/dark/core/DarkMain.java

@@ -33,6 +33,7 @@ import dark.core.blocks.BlockMulti;
 import dark.core.blocks.BlockOre;
 import dark.core.blocks.TileEntityMulti;
 import dark.core.helpers.FluidRestrictionHandler;
+import dark.core.helpers.SaveManager;
 import dark.core.items.EnumMeterials;
 import dark.core.items.ItemBattery;
 import dark.core.items.ItemBlockHolder;
@@ -42,6 +43,7 @@ import dark.core.items.ItemParts;
 import dark.core.items.ItemParts.Parts;
 import dark.core.items.ItemTools;
 import dark.core.items.ItemWrench;
+import dark.prefab.ModPrefab;
 
 /** @author HangCow, DarkGuardsman */
 @Mod(modid = DarkMain.MOD_ID, name = DarkMain.MOD_NAME, version = DarkMain.VERSION, dependencies = "after:BuildCraft|Energy", useMetadata = true)

src/dark/core/access/GlobalAccessLoader.java

@@ -4,8 +4,8 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.MinecraftForge;
 import cpw.mods.fml.common.Mod.ServerStarting;
 import cpw.mods.fml.common.event.FMLServerStartingEvent;
-import dark.core.INbtSave;
-import dark.core.SaveManager;
+import dark.core.helpers.INbtSave;
+import dark.core.helpers.SaveManager;
 
 public class GlobalAccessLoader implements INbtSave
 {

src/dark/core/access/GlobalAccessManager.java

@@ -8,7 +8,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 import net.minecraft.nbt.NBTTagCompound;
-import dark.core.NBTFileLoader;
+import dark.core.helpers.NBTFileLoader;
 
 public class GlobalAccessManager
 {

src/dark/core/blocks/IMultiBlock.java

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

src/dark/core/gui/GuiGlobalList.java

@@ -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.api.IScroll;
 import dark.core.DarkMain;
 import dark.core.access.UserAccess;
+import dark.interfaces.IScroll;
 
 @SideOnly(Side.CLIENT)
 public class GuiGlobalList extends GuiContainer implements IScroll

src/dark/core/helpers/FluidRestrictionHandler.java

@@ -8,7 +8,7 @@ import net.minecraftforge.fluids.FluidRegistry.FluidRegisterEvent;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 
-import dark.api.ColorCode;
+import dark.interfaces.ColorCode;
 
 public class FluidRestrictionHandler
 {

src/dark/core/helpers/INbtSave.java

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

src/dark/core/helpers/NBTFileLoader.java

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

src/dark/core/helpers/SaveManager.java

@@ -1,8 +1,9 @@
-package dark.core;
+package dark.core.helpers;
 
 import java.util.ArrayList;
 import java.util.List;
 
+
 import net.minecraftforge.common.MinecraftForge;
 
 public class SaveManager

src/dark/core/items/ItemTools.java

@@ -20,10 +20,10 @@ import universalelectricity.core.block.IElectrical;
 import universalelectricity.core.block.IElectricalStorage;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.api.IToolReadOut;
-import dark.api.IToolReadOut.EnumTools;
 import dark.core.DarkMain;
 import dark.core.helpers.FluidHelper;
+import dark.interfaces.IToolReadOut;
+import dark.interfaces.IToolReadOut.EnumTools;
 
 public class ItemTools extends ItemBasic
 {

src/dark/core/terminal/CommandHelp.java

@@ -4,8 +4,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import net.minecraft.entity.player.EntityPlayer;
-import dark.api.ISpecialAccess;
-import dark.api.ITerminal;
+import dark.interfaces.ISpecialAccess;
+import dark.interfaces.ITerminal;
 
 public class CommandHelp extends TerminalCommand
 {

src/dark/core/terminal/CommandRegistry.java

@@ -4,7 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import net.minecraft.entity.player.EntityPlayer;
-import dark.api.ITerminal;
+import dark.interfaces.ITerminal;
 
 /** @author Calclavia, DarkGuardsman */
 public class CommandRegistry

src/dark/core/terminal/CommandUser.java

@@ -4,9 +4,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 import net.minecraft.entity.player.EntityPlayer;
-import dark.api.ISpecialAccess;
-import dark.api.ITerminal;
 import dark.core.access.AccessLevel;
+import dark.interfaces.ISpecialAccess;
+import dark.interfaces.ITerminal;
 
 public class CommandUser extends TerminalCommand
 {

src/dark/core/terminal/TerminalCommand.java

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

src/dark/core/terminal/TileEntityTerminal.java

@@ -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.api.ISpecialAccess;
-import dark.api.ITerminal;
 import dark.core.access.AccessLevel;
 import dark.core.access.UserAccess;
-import dark.core.blocks.TileEntityMachine;
+import dark.interfaces.ISpecialAccess;
+import dark.interfaces.ITerminal;
+import dark.prefab.TileEntityMachine;
 
 /** @author Calclavia, DarkGuardsman */
 public abstract class TileEntityTerminal extends TileEntityMachine implements ISpecialAccess, IPacketReceiver, ITerminal

src/dark/core/tile/network/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.INetworkPart;
+import dark.interfaces.INetworkPart;
 
 /** Check if a conductor connects with another. */
 public class NetworkPathFinder extends Pathfinder

src/dark/core/tile/network/NetworkSharedPower.java

@@ -2,9 +2,9 @@ package dark.core.tile.network;
 
 import net.minecraft.tileentity.TileEntity;
 import universalelectricity.core.block.IElectricalStorage;
-import dark.api.INetworkEnergyPart;
-import dark.api.INetworkPart;
-import dark.api.IPowerLess;
+import dark.interfaces.INetworkEnergyPart;
+import dark.interfaces.INetworkPart;
+import dark.interfaces.IPowerLess;
 
 /** 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/tile/network/NetworkTileEntities.java

@@ -12,8 +12,8 @@ import universalelectricity.core.path.Pathfinder;
 import universalelectricity.core.vector.Vector3;
 import universalelectricity.core.vector.VectorHelper;
 import cpw.mods.fml.common.FMLLog;
-import dark.api.INetworkPart;
 import dark.core.helpers.ConnectionHelper;
+import dark.interfaces.INetworkPart;
 
 public abstract class NetworkTileEntities
 {

src/dark/interfaces/ColorCode.java

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

src/dark/interfaces/IBlockActivate.java

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

src/dark/interfaces/IColorCoded.java

@@ -1,4 +1,4 @@
-package dark.api;
+package dark.interfaces;
 
 public interface IColorCoded
 {

src/dark/interfaces/IDisableable.java

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

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

src/dark/interfaces/IHeatObject.java

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

src/dark/interfaces/IHeatProducer.java

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

src/dark/interfaces/IInvBox.java

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

src/dark/interfaces/INetworkEnergyPart.java

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

src/dark/interfaces/INetworkPart.java

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

src/dark/interfaces/IPowerLess.java

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

src/dark/interfaces/IPsiReciever.java

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

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

src/dark/interfaces/ISpecialAccess.java

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

src/dark/interfaces/ITerminal.java

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

src/dark/interfaces/ITileConnector.java

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

src/dark/interfaces/IToolReadOut.java

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

src/dark/interfaces/PowerSystems.java

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

src/dark/prefab/BlockMachine.java

@@ -1,4 +1,4 @@
-package dark.core.blocks;
+package dark.prefab;
 
 import net.minecraft.block.ITileEntityProvider;
 import net.minecraft.block.material.Material;
@@ -15,8 +15,8 @@ import net.minecraftforge.common.Configuration;
 import universalelectricity.prefab.block.BlockAdvanced;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.api.INetworkPart;
 import dark.core.DarkMain;
+import dark.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/prefab/InvChest.java

@@ -1,4 +1,4 @@
-package dark.core.blocks;
+package dark.prefab;
 
 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.api.IExternalInv;
-import dark.api.IInvBox;
+import dark.interfaces.IExternalInv;
+import dark.interfaces.IInvBox;
 
 public class InvChest implements IInvBox
 {

src/dark/prefab/ModPrefab.java

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

src/dark/prefab/TileEntityInv.java

@@ -1,4 +1,4 @@
-package dark.core.blocks;
+package dark.prefab;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.ISidedInventory;
@@ -6,8 +6,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.ForgeDirection;
 import universalelectricity.prefab.tile.TileEntityAdvanced;
-import dark.api.IExternalInv;
-import dark.api.IInvBox;
+import dark.interfaces.IExternalInv;
+import dark.interfaces.IInvBox;
 
 public class TileEntityInv extends TileEntityAdvanced implements IExternalInv, ISidedInventory
 {

src/dark/prefab/TileEntityMachine.java

@@ -1,4 +1,4 @@
-package dark.core.blocks;
+package dark.prefab;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
@@ -23,11 +23,11 @@ import com.google.common.io.ByteArrayDataInput;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.api.IDisableable;
-import dark.api.IExternalInv;
-import dark.api.IInvBox;
-import dark.api.IPowerLess;
-import dark.api.PowerSystems;
+import dark.interfaces.IDisableable;
+import dark.interfaces.IExternalInv;
+import dark.interfaces.IInvBox;
+import dark.interfaces.IPowerLess;
+import dark.interfaces.PowerSystems;
 
 public abstract class TileEntityMachine extends TileEntityUniversalElectrical implements ISidedInventory, IExternalInv, IDisableable, IPacketReceiver, IPowerLess
 {