refractor/move/cleanup

src/dark/api/reciepes/MachineRecipeHandler.java

@@ -20,7 +20,7 @@ import dark.core.basics.EnumMaterial;
 import dark.core.basics.EnumOrePart;
 import dark.core.basics.ItemOreDirv;
 import dark.core.helpers.AutoCraftingManager;
-import dark.machines.common.CoreRecipeLoader;
+import dark.machines.CoreRecipeLoader;
 
 /** Recipes for ore processor machines
  * 

src/dark/core/CoreMachine.java

@@ -9,8 +9,6 @@ import dark.api.save.SaveManager;
 import dark.core.prefab.LaserEntityDamageSource;
 import dark.core.prefab.fluids.FluidHelper;
 import dark.core.prefab.tilenetwork.NetworkUpdateHandler;
-import dark.machines.common.ExternalModHandler;
-import dark.machines.common.PlayerKeyHandler;
 
 public class CoreMachine
 {

src/dark/core/DMCreativeTab.java

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

src/dark/core/EntityTickHandler.java

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

src/dark/core/ExternalModHandler.java

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

src/dark/core/ModObjectRegistry.java

@@ -26,7 +26,7 @@ import dark.core.interfaces.IExtraInfo.IExtraBlockInfo;
 import dark.core.interfaces.IExtraInfo.IExtraItemInfo;
 import dark.core.prefab.BlockFluid;
 import dark.core.prefab.machine.BlockMachine;
-import dark.machines.common.DarkMain;
+import dark.machines.DarkMain;
 
 /** Handler to make registering all parts of a mod's objects that are loaded into the game by forge
  * 

src/dark/core/PlayerKeyHandler.java

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

src/dark/core/basics/BlockGasOre.java

@@ -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.DMCreativeTab;
 import dark.core.prefab.ModPrefab;
 import dark.core.prefab.fluids.EnumGas;
-import dark.machines.common.DMCreativeTab;
-import dark.machines.common.DarkMain;
+import dark.machines.DarkMain;
 
 /** Gas that is designed to generate underground in the same way as an ore
  * 

src/dark/core/basics/BlockOre.java

@@ -22,8 +22,8 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import dark.core.interfaces.IExtraInfo.IExtraBlockInfo;
 import dark.core.prefab.ModPrefab;
-import dark.machines.common.CoreRecipeLoader;
-import dark.machines.common.DarkMain;
+import dark.machines.CoreRecipeLoader;
+import dark.machines.DarkMain;
 
 public class BlockOre extends Block implements IExtraBlockInfo
 {

src/dark/core/basics/EnumMaterial.java

@@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.Icon;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.machines.common.CoreRecipeLoader;
+import dark.machines.CoreRecipeLoader;
 
 /** Class for storing materials, there icon names, sub items to be made from them or there sub ores
  * 

src/dark/core/basics/GasOreGenerator.java

@@ -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.machines.common.CoreRecipeLoader;
+import dark.machines.CoreRecipeLoader;
 
 public class GasOreGenerator implements IWorldGenerator
 {

src/dark/core/basics/ItemBlockOre.java

@@ -3,7 +3,7 @@ package dark.core.basics;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import dark.core.basics.BlockOre.OreData;
-import dark.machines.common.DarkMain;
+import dark.machines.DarkMain;
 
 public class ItemBlockOre extends ItemBlock
 {

src/dark/core/basics/ItemCommonTool.java

@@ -37,7 +37,7 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import dark.core.interfaces.IExtraInfo.IExtraItemInfo;
 import dark.core.prefab.ModPrefab;
-import dark.machines.common.DarkMain;
+import dark.machines.DarkMain;
 
 /** Flexible tool class that uses NBT to store damage and effect rather than metadata. Metadata
  * instead is used to store sub items allowing several different tools to exist within the same item

src/dark/core/basics/ItemOreDirv.java

@@ -16,7 +16,7 @@ import dark.api.events.LaserEvent;
 import dark.core.interfaces.IExtraInfo.IExtraItemInfo;
 import dark.core.prefab.ItemBasic;
 import dark.core.prefab.ModPrefab;
-import dark.machines.common.DarkMain;
+import dark.machines.DarkMain;
 
 /** A series of items that are derived from a basic material
  * 

src/dark/core/basics/ItemParts.java

@@ -13,7 +13,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 import dark.core.interfaces.IExtraInfo.IExtraItemInfo;
 import dark.core.prefab.ItemBasic;
 import dark.core.prefab.ModPrefab;
-import dark.machines.common.DarkMain;
+import dark.machines.DarkMain;
 
 /** A meta data item containing parts of various crafting recipes. These parts do not do anything but
  * allow new crafting recipes to be created.

src/dark/core/interfaces/IInvBox.java

@@ -9,7 +9,7 @@ import net.minecraft.nbt.NBTTagCompound;
  * automation. As well this is not designed to replace the need for IInventory support of a tile but
  * to make it easier to manage. Suggested use it to create a prefab manager for several tiles. Then
  * have those tiles use the prefab as an extermal inventory manager to reduce code size per class.
- * 
+ *
  * @author DarkGuardsman */
 public interface IInvBox extends ISidedInventory
 {
@@ -21,4 +21,7 @@ public interface IInvBox extends ISidedInventory
 
     /** Called to load the inventory array */
     public void loadInv(NBTTagCompound tag);
+
+    /** Dels all the items in the inventory */
+    public void clear();
 }

src/dark/core/loader/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.machines.common.DarkMain;
+import dark.machines.DarkMain;
 
 public class DarkCoreModContainer extends DummyModContainer
 {

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.machines.common.DarkMain;
+import dark.machines.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.machines.common.DarkMain;
+import dark.machines.DarkMain;
 
 public class PacketManagerEntity implements IPacketManager
 {

src/dark/core/network/PacketManagerKeyEvent.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.interfaces.IControlReceiver;
-import dark.machines.common.DarkMain;
+import dark.machines.DarkMain;
 
 public class PacketManagerKeyEvent implements IPacketManager
 {

src/dark/core/prefab/BlockFluid.java

@@ -8,7 +8,7 @@ import net.minecraftforge.fluids.BlockFluidFinite;
 import net.minecraftforge.fluids.Fluid;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.machines.common.DarkMain;
+import dark.machines.DarkMain;
 
 public class BlockFluid extends BlockFluidFinite
 {

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.machines.common.DarkMain;
+import dark.machines.DarkMain;
 
 public class ItemBasic extends Item
 {

src/dark/core/prefab/ModPrefab.java

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

src/dark/core/prefab/RecipeLoader.java

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

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

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

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

@@ -12,8 +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.DMCreativeTab;
 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.machines.common.DarkMain;
+import dark.machines.DarkMain;
 
 /** When done should be a prefab that can be used to render a power bar on the screen
  * 

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.machines.common.DarkMain;
+import dark.machines.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.machines.common.DarkMain;
+import dark.machines.DarkMain;
 
 public class GuiMessageBox extends GuiBase
 {

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

@@ -246,4 +246,11 @@ public class InvChest implements IInvBox
 
     }
 
+    @Override
+    public void clear()
+    {
+        this.containedItems = null;
+        this.getContainedItems();
+    }
+
 }

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

@@ -29,7 +29,7 @@ import dark.core.ModObjectRegistry.BlockBuildData;
 import dark.core.interfaces.IBlockActivated;
 import dark.core.interfaces.IExtraInfo.IExtraBlockInfo;
 import dark.core.prefab.ModPrefab;
-import dark.machines.common.DarkMain;
+import dark.machines.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

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

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

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

@@ -16,7 +16,7 @@ import universalelectricity.core.grid.IElectricityNetwork;
 import universalelectricity.core.vector.Vector3;
 import universalelectricity.core.vector.VectorHelper;
 import dark.api.energy.IPowerLess;
-import dark.machines.common.ExternalModHandler;
+import dark.core.ExternalModHandler;
 
 /** Basic energy tile that can consume power
  *

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

@@ -22,7 +22,7 @@ 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;
+import dark.machines.DarkMain;
 
 public abstract class TileEntityMachine extends TileEntityInv implements ISidedInventory, IExternalInv, IDisableable, ISimplePacketReceiver, IRotatable, IExtraTileEntityInfo
 {

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

@@ -11,7 +11,7 @@ import com.builtbroken.common.Pair;
 import dark.core.ModObjectRegistry;
 import dark.core.prefab.ItemBlockHolder;
 import dark.core.prefab.machine.BlockMachine;
-import dark.machines.common.DarkMain;
+import dark.machines.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. Renders need to still be handled by the respective mod.

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

@@ -2,7 +2,7 @@ package dark.core.prefab.sentry;
 
 import net.minecraft.block.material.Material;
 import dark.core.prefab.machine.BlockMachine;
-import dark.machines.common.DarkMain;
+import dark.machines.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

@@ -21,7 +21,7 @@ import dark.core.helpers.RayTraceHelper;
 import dark.core.network.PacketHandler;
 import dark.core.prefab.entities.EntityTileDamage;
 import dark.core.prefab.machine.TileEntityMachine;
-import dark.machines.common.DarkMain;
+import dark.machines.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/machines/CommonProxy.java

@@ -1,4 +1,4 @@
-package dark.machines.common;
+package dark.machines;
 
 import java.awt.Color;
 
@@ -8,10 +8,10 @@ import net.minecraft.world.World;
 import universalelectricity.core.vector.Vector3;
 import cpw.mods.fml.common.network.IGuiHandler;
 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;
+import dark.machines.generators.ContainerCoalGenerator;
+import dark.machines.generators.TileEntitySteamGen;
+import dark.machines.machines.ContainerBatteryBox;
+import dark.machines.machines.TileEntityBatteryBox;
 
 public class CommonProxy implements IGuiHandler
 {

src/dark/machines/CoreRecipeLoader.java

@@ -1,4 +1,4 @@
-package dark.machines.common;
+package dark.machines;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
@@ -19,11 +19,12 @@ import dark.core.basics.ItemOreDirv;
 import dark.core.basics.ItemParts;
 import dark.core.basics.BlockOre.OreData;
 import dark.core.basics.ItemParts.Parts;
-import dark.machines.common.blocks.BlockBasalt;
-import dark.machines.common.items.ItemReadoutTools;
-import dark.machines.common.items.ItemWrench;
-import dark.machines.common.machines.BlockSolarPanel;
-import dark.machines.common.transmit.BlockWire;
+import dark.core.prefab.RecipeLoader;
+import dark.machines.deco.BlockBasalt;
+import dark.machines.generators.BlockSolarPanel;
+import dark.machines.items.ItemReadoutTools;
+import dark.machines.items.ItemWrench;
+import dark.machines.transmit.BlockWire;
 
 public class CoreRecipeLoader extends RecipeLoader
 {

src/dark/machines/DarkMain.java

@@ -1,4 +1,4 @@
-package dark.machines.common;
+package dark.machines;
 
 import java.awt.Color;
 import java.io.File;
@@ -34,6 +34,7 @@ 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.DMCreativeTab;
 import dark.core.ModObjectRegistry;
 import dark.core.basics.BlockGasOre;
 import dark.core.basics.BlockOre;
@@ -55,23 +56,23 @@ 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.machines.common.blocks.BlockBasalt;
-import dark.machines.common.blocks.BlockColorGlass;
-import dark.machines.common.blocks.BlockColorGlowGlass;
-import dark.machines.common.blocks.BlockColorSand;
-import dark.machines.common.blocks.ItemBlockColored;
-import dark.machines.common.items.ItemBattery;
-import dark.machines.common.items.ItemColoredDust;
-import dark.machines.common.items.ItemFluidCan;
-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;
+import dark.machines.deco.BlockBasalt;
+import dark.machines.deco.BlockColorGlass;
+import dark.machines.deco.BlockColorGlowGlass;
+import dark.machines.deco.BlockColorSand;
+import dark.machines.deco.ItemBlockColored;
+import dark.machines.generators.BlockSmallSteamGen;
+import dark.machines.generators.BlockSolarPanel;
+import dark.machines.items.ItemBattery;
+import dark.machines.items.ItemColoredDust;
+import dark.machines.items.ItemFluidCan;
+import dark.machines.items.ItemReadoutTools;
+import dark.machines.items.ItemWrench;
+import dark.machines.machines.BlockDebug;
+import dark.machines.machines.BlockEnergyStorage;
+import dark.machines.machines.ItemBlockEnergyStorage;
+import dark.machines.transmit.BlockWire;
+import dark.machines.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/client/ClientProxy.java

@@ -14,13 +14,13 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import dark.core.prefab.ModPrefab;
 import dark.core.prefab.entities.EntityTestCar;
+import dark.machines.CommonProxy;
+import dark.machines.CoreRecipeLoader;
 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;
+import dark.machines.machines.TileEntityBatteryBox;
 
 @SideOnly(Side.CLIENT)
 public class ClientProxy extends CommonProxy

src/dark/machines/client/FXBeam.java

@@ -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.machines.common.DarkMain;
+import dark.machines.DarkMain;
 
 /** Based off Thaumcraft's Beam Renderer.
  * 

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

@@ -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.machines.common.DarkMain;
-import dark.machines.common.machines.ContainerBatteryBox;
-import dark.machines.common.machines.TileEntityBatteryBox;
+import dark.machines.DarkMain;
+import dark.machines.machines.ContainerBatteryBox;
+import dark.machines.machines.TileEntityBatteryBox;
 
 @SideOnly(Side.CLIENT)
 public class GuiBatteryBox extends GuiContainer

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

@@ -13,7 +13,7 @@ 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;
+import dark.machines.DarkMain;
 
 /** To be used with all machine that have a gui to allow generic settings and feature all all devices
  * 

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

@@ -13,10 +13,10 @@ import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import dark.core.prefab.ModPrefab;
+import dark.machines.CoreRecipeLoader;
+import dark.machines.DarkMain;
 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

@@ -11,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.machines.CoreRecipeLoader;
+import dark.machines.DarkMain;
 import dark.machines.client.models.ModelSmallFluidCan;
-import dark.machines.common.CoreRecipeLoader;
-import dark.machines.common.DarkMain;
-import dark.machines.common.items.ItemFluidCan;
+import dark.machines.items.ItemFluidCan;
 
 @SideOnly(Side.CLIENT)
 public class ItemRenderFluidCan implements IItemRenderer

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

@@ -7,8 +7,8 @@ import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import dark.machines.DarkMain;
 import dark.machines.client.models.ModelSolarPanel;
-import dark.machines.common.DarkMain;
 
 @SideOnly(Side.CLIENT)
 public class RenderBlockSolarPanel extends RenderTileMachine

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

@@ -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.machines.DarkMain;
 import dark.machines.client.models.ModelCopperWire;
-import dark.machines.common.DarkMain;
 
 @SideOnly(Side.CLIENT)
 public class RenderBlockWire extends RenderTileMachine

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

@@ -10,10 +10,10 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import dark.core.prefab.ModPrefab;
 import dark.core.prefab.machine.TileEntityMachine;
+import dark.machines.DarkMain;
 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

@@ -11,8 +11,8 @@ import org.lwjgl.opengl.GL11;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import dark.core.prefab.entities.EntityAdvanced;
+import dark.machines.DarkMain;
 import dark.machines.client.models.ModelTestCar;
-import dark.machines.common.DarkMain;
 
 @SideOnly(Side.CLIENT)
 public class RenderTestCar extends Render

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

@@ -1,78 +0,0 @@
-package dark.machines.common.blocks;
-
-import java.io.IOException;
-
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.packet.Packet;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.fluids.FluidStack;
-
-import com.google.common.io.ByteArrayDataInput;
-
-import cpw.mods.fml.common.network.Player;
-import dark.core.network.ISimplePacketReceiver;
-import dark.core.network.PacketHandler;
-import dark.machines.common.DarkMain;
-
-public class TileEntityGasBlock extends TileEntity implements ISimplePacketReceiver
-{
-    private FluidStack stack = null;
-
-    public FluidStack getFluidStack()
-    {
-        return stack;
-    }
-
-    public void setStack(FluidStack stack)
-    {
-        this.stack = stack;
-    }
-
-    @Override
-    public void readFromNBT(NBTTagCompound nbt)
-    {
-        super.readFromNBT(nbt);
-        this.stack = FluidStack.loadFluidStackFromNBT(nbt.getCompoundTag("Fluid"));
-    }
-
-    @Override
-    public void writeToNBT(NBTTagCompound nbt)
-    {
-        super.writeToNBT(nbt);
-        nbt.setCompoundTag("fluid", this.getFluidStack().writeToNBT(new NBTTagCompound()));
-    }
-
-    @Override
-    public boolean canUpdate()
-    {
-        return false;
-    }
-
-    @Override
-    public boolean simplePacket(String id, ByteArrayDataInput data, Player player)
-    {
-        try
-        {
-            if (id.equalsIgnoreCase("Desc"))
-            {
-                this.stack = FluidStack.loadFluidStackFromNBT(PacketHandler.instance().readNBTTagCompound(data));
-                return true;
-            }
-        }
-        catch (IOException e)
-        {
-            e.printStackTrace();
-        }
-        return false;
-    }
-
-    @Override
-    public Packet getDescriptionPacket()
-    {
-        if (this.stack != null)
-        {
-            return PacketHandler.instance().getTilePacket(DarkMain.CHANNEL, this, "Desc", this.stack.writeToNBT(new NBTTagCompound()));
-        }
-        return null;
-    }
-}

src/dark/machines/common/machines/BlockHeater.java

@@ -1,156 +0,0 @@
-package dark.machines.common.machines;
-
-import java.util.List;
-import java.util.Set;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.MovingObjectPosition;
-import net.minecraft.world.World;
-import net.minecraftforge.common.Configuration;
-
-import com.builtbroken.common.Pair;
-
-import dark.core.ModObjectRegistry.BlockBuildData;
-import dark.core.prefab.machine.BlockMachine;
-import dark.machines.common.CommonProxy;
-import dark.machines.common.DarkMain;
-
-public class BlockHeater extends BlockMachine
-{
-
-    public BlockHeater(BlockBuildData data)
-    {
-        super(data);
-    }
-
-    @Override
-    public boolean onUseWrench(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float hitX, float hitY, float hitZ)
-    {
-        if (world.getBlockMetadata(x, y, z) % 4 < 3)
-        {
-            world.setBlockMetadataWithNotify(x, y, z, world.getBlockMetadata(x, y, z) + 1, 3);
-            return true;
-        }
-        else
-        {
-            world.setBlockMetadataWithNotify(x, y, z, world.getBlockMetadata(x, y, z) - 3, 3);
-            return true;
-        }
-    }
-
-    @Override
-    public void getTileEntities(int blockID, Set<Pair<String, Class<? extends TileEntity>>> list)
-    {
-        for (HeatMachineData data : HeatMachineData.values())
-        {
-            list.add(new Pair<String, Class<? extends TileEntity>>("DC" + data.unlocalizedName, data.clazz));
-        }
-    }
-
-    @Override
-    public void loadExtraConfigs(Configuration config)
-    {
-        super.loadExtraConfigs(config);
-    }
-
-    /** Called when the block is right clicked by the player */
-    @Override
-    public boolean onMachineActivated(World par1World, int x, int y, int z, EntityPlayer par5EntityPlayer, int side, float hitX, float hitY, float hitZ)
-    {
-
-        if (!par1World.isRemote)
-        {
-            par5EntityPlayer.openGui(DarkMain.getInstance(), HeatMachineData.values()[par1World.getBlockMetadata(x, y, z) / 4].guiID, par1World, x, y, z);
-        }
-
-        return true;
-    }
-
-    @Override
-    public boolean isOpaqueCube()
-    {
-        return false;
-    }
-
-    @Override
-    public boolean renderAsNormalBlock()
-    {
-        return false;
-    }
-
-    @Override
-    public TileEntity createTileEntity(World world, int metadata)
-    {
-        try
-        {
-            return HeatMachineData.values()[metadata / 4].clazz.newInstance();
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-        return null;
-
-    }
-
-    @Override
-    public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List)
-    {
-        par3List.add(new ItemStack(par1, 1, 0));
-        par3List.add(new ItemStack(par1, 1, 8));
-        par3List.add(new ItemStack(par1, 1, 12));
-    }
-
-    @Override
-    public int damageDropped(int metadata)
-    {
-        return metadata / 4;
-    }
-
-    @Override
-    public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z)
-    {
-        int id = idPicked(world, x, y, z);
-
-        if (id == 0)
-        {
-            return null;
-        }
-
-        Item item = Item.itemsList[id];
-
-        if (item == null)
-        {
-            return null;
-        }
-
-        int metadata = getDamageValue(world, x, y, z);
-
-        return new ItemStack(id, 1, metadata);
-    }
-
-    public static enum HeatMachineData
-    {
-        HEAT_COUPLE("themalcouple", 0, CommonProxy.GUI_COAL_GEN, TileEntitySteamGen.class),
-        HEAT_EXCHANGE("heatexchanger", 4, CommonProxy.GUI_FUEL_GEN, TileEntitySteamGen.class),
-        HEAT_PLATE("heatplate", 8, CommonProxy.GUI_BATTERY_BOX, null);
-
-        public String unlocalizedName;
-        public int startMeta, guiID;
-        public boolean enabled = true;
-        public boolean allowCrafting = true;
-        public Class<? extends TileEntity> clazz;
-
-        private HeatMachineData(String name, int meta, int guiID, Class<? extends TileEntity> clazz)
-        {
-            this.unlocalizedName = name;
-            this.startMeta = meta;
-            this.guiID = guiID;
-            this.clazz = clazz;
-        }
-    }
-}

src/dark/machines/common/machines/IDebugTile.java

@@ -1,8 +0,0 @@
-package dark.machines.common.machines;
-
-import dark.core.interfaces.IBlockActivated;
-
-public interface IDebugTile extends IBlockActivated
-{
-
-}

src/dark/machines/common/machines/ItemBlockEnergyStorage.java

@@ -1,49 +0,0 @@
-package dark.machines.common.machines;
-
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-
-/** Item version of the enrgy storage block
- *
- * @author Darkguardsman */
-public class ItemBlockEnergyStorage extends ItemBlock
-{
-    public ItemBlockEnergyStorage(int id)
-    {
-        super(id);
-        this.setMaxDamage(0);
-        this.setHasSubtypes(true);
-    }
-
-    @Override
-    public int getMetadata(int damage)
-    {
-        return damage;
-    }
-
-    @Override
-    public String getUnlocalizedName(ItemStack itemStack)
-    {
-        return Block.blocksList[this.getBlockID()].getUnlocalizedName() + "." + itemStack.getItemDamage();
-    }
-
-    @Override
-    public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata)
-    {
-        if (!world.setBlock(x, y, z, this.getBlockID(), side, 3))
-        {
-            return false;
-        }
-
-        if (world.getBlockId(x, y, z) == this.getBlockID())
-        {
-            Block.blocksList[this.getBlockID()].onBlockPlacedBy(world, x, y, z, player, stack);
-            Block.blocksList[this.getBlockID()].onPostBlockPlaced(world, x, y, z, metadata);
-        }
-
-        return true;
-    }
-}

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

@@ -1,14 +0,0 @@
-package dark.machines.common.transmit;
-
-import net.minecraft.block.material.Material;
-import universalelectricity.prefab.block.BlockAdvanced;
-
-public class BlockLaserEmitter extends BlockAdvanced
-{
-
-    public BlockLaserEmitter(int id)
-    {
-        super(id, Material.iron);
-    }
-
-}

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

@@ -1,11 +0,0 @@
-package dark.machines.common.transmit;
-
-import net.minecraft.item.ItemBlock;
-
-public class ItemBlockLaserEmitter extends ItemBlock
-{
-    public ItemBlockLaserEmitter(int par1)
-    {
-        super(par1);
-    }
-}

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

@@ -1,125 +0,0 @@
-package dark.machines.common.transmit;
-
-import java.awt.Color;
-
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.EnumMovingObjectType;
-import net.minecraft.util.MovingObjectPosition;
-import net.minecraftforge.common.ForgeDirection;
-import universalelectricity.core.vector.Vector3;
-import dark.core.prefab.machine.TileEntityEnergyMachine;
-import dark.machines.common.DarkMain;
-
-public class TileEntityLaserEmitter extends TileEntityEnergyMachine
-{
-    /** Is tile set up to receive power */
-    private boolean receiver = false;
-    /** Demand of connected network */
-    private float powerDemand = 0.0f;
-    /** Supply from other laser emitter */
-    private float powerSupply = 0.0f;
-    private float yaw, pitch, prevYaw, prevPitch, deltaYaw, deltaPitch;
-    /** Color of renderer laser */
-    private Color color = Color.red;
-    /** Linked emitter */
-    TileEntityLaserEmitter linkedEmitter = null;
-    Vector3 laserTarget = null;
-
-    public TileEntityLaserEmitter()
-    {
-        super(.001f/* 1W/t*/, 1f/* 1000W battery*/);
-    }
-
-    /** Facing direction of the tile and not the laser */
-    public ForgeDirection getFacingDirection()
-    {
-        int meta = 0;
-        if (this.worldObj != null)
-        {
-            meta = (worldObj.getBlockMetadata(xCoord, yCoord, zCoord) % 6);
-        }
-        return ForgeDirection.getOrientation(meta);
-    }
-
-    @Override
-    public void updateEntity()
-    {
-        super.updateEntity();
-        if (this.isFunctioning())
-        {
-            this.updateRotation();
-            if (this.linkedEmitter != null && ticks % 20 == 0)
-            {
-                this.createLaser(new Vector3(linkedEmitter));
-            }
-            else if (laserTarget != null)
-            {
-                TileEntity entity = laserTarget.getTileEntity(this.worldObj);
-                if (entity instanceof TileEntityLaserEmitter && ((TileEntityLaserEmitter) entity).receiver != this.receiver)
-                {
-                    linkedEmitter = (TileEntityLaserEmitter) entity;
-                }
-            }
-        }
-    }
-
-    public void updateRotation()
-    {
-
-    }
-
-    protected void createLaser(Vector3 target)
-    {
-        Vector3 start = new Vector3(this);
-        double distance = start.distance(target);
-        MovingObjectPosition hit = start.rayTrace(this.worldObj, yaw, pitch, true, distance);
-        if (hit != null)
-        {
-            if (hit.typeOfHit == EnumMovingObjectType.ENTITY)
-            {
-                //TODO damage entity if power is over 1000W
-            }
-            else
-            {
-
-            }
-        }
-        else
-        {
-            DarkMain.proxy.renderBeam(this.worldObj, start, target, color, 20);
-        }
-    }
-
-    @Override
-    public boolean canConnect(ForgeDirection direction)
-    {
-        return direction == this.getFacingDirection().getOpposite();
-    }
-
-    @Override
-    public float getRequest(ForgeDirection side)
-    {
-        if (!receiver && side == getFacingDirection().getOpposite())
-        {
-            return powerDemand;
-        }
-        return 0;
-    }
-
-    @Override
-    public float getProvide(ForgeDirection direction)
-    {
-        if (receiver && direction == getFacingDirection().getOpposite())
-        {
-            return powerSupply;
-        }
-        return 0;
-    }
-
-    @Override
-    public String getChannel()
-    {
-        return DarkMain.CHANNEL;
-    }
-
-}

src/dark/machines/deco/BlockBasalt.java

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

src/dark/machines/deco/BlockColorGlass.java

@@ -1,4 +1,4 @@
-package dark.machines.common.blocks;
+package dark.machines.deco;
 
 import java.util.Random;
 
@@ -6,9 +6,8 @@ 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.prefab.BlockColored;
 import dark.core.prefab.ModPrefab;
-import dark.machines.common.DarkMain;
+import dark.machines.DarkMain;
 
 public class BlockColorGlass extends BlockColored
 {

src/dark/machines/deco/BlockColorGlowGlass.java

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

src/dark/machines/deco/BlockColorSand.java

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

src/dark/machines/deco/BlockColored.java

@@ -1,4 +1,4 @@
-package dark.core.prefab;
+package dark.machines.deco;
 
 import java.util.List;
 
@@ -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.machines.common.DarkMain;
+import dark.machines.DarkMain;
 
 /** Prefab class to make any block have 16 separate color instances similar to wool block
  * 

src/dark/machines/deco/ItemBlockBasalt.java

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

src/dark/machines/deco/ItemBlockColored.java

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

src/dark/machines/generators/BlockSmallSteamGen.java

@@ -1,4 +1,4 @@
-package dark.machines.common.machines;
+package dark.machines.generators;
 
 import java.util.List;
 import java.util.Random;
@@ -19,12 +19,12 @@ import com.builtbroken.common.Pair;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import dark.core.DMCreativeTab;
 import dark.core.ModObjectRegistry.BlockBuildData;
 import dark.core.helpers.MathHelper;
 import dark.core.prefab.machine.BlockMachine;
 import dark.machines.client.renders.BlockRenderingHandler;
 import dark.machines.client.renders.RenderSteamGen;
-import dark.machines.common.DMCreativeTab;
 
 /** Starter power setup using steam generated by burning items or fuels. This setup takes two blocks.
  * A) the generator B) the collector The generator creates the steam and burns the fuel. The

src/dark/machines/generators/BlockSolarPanel.java

@@ -1,4 +1,4 @@
-package dark.machines.common.machines;
+package dark.machines.generators;
 
 import java.util.List;
 import java.util.Set;
@@ -15,11 +15,11 @@ import com.builtbroken.common.Pair;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import dark.core.DMCreativeTab;
 import dark.core.ModObjectRegistry.BlockBuildData;
 import dark.core.prefab.machine.BlockMachine;
 import dark.machines.client.renders.BlockRenderingHandler;
 import dark.machines.client.renders.RenderBlockSolarPanel;
-import dark.machines.common.DMCreativeTab;
 
 public class BlockSolarPanel extends BlockMachine
 {

src/dark/machines/generators/ContainerCoalGenerator.java

@@ -1,4 +1,4 @@
-package dark.machines.common.machines;
+package dark.machines.generators;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;

src/dark/machines/generators/TileEntitySolarPanel.java

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

src/dark/machines/generators/TileEntitySteamFan.java

@@ -1,4 +1,4 @@
-package dark.machines.common.machines;
+package dark.machines.generators;
 
 public class TileEntitySteamFan extends TileEntitySteamPiston
 {

src/dark/machines/generators/TileEntitySteamGen.java

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

src/dark/machines/generators/TileEntitySteamPiston.java

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

src/dark/machines/items/ItemBattery.java

@@ -1,4 +1,4 @@
-package dark.machines.common.items;
+package dark.machines.items;
 
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.creativetab.CreativeTabs;
@@ -10,7 +10,7 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import dark.core.interfaces.IExtraInfo.IExtraItemInfo;
 import dark.core.prefab.ModPrefab;
-import dark.machines.common.DarkMain;
+import dark.machines.DarkMain;
 
 /** Simple battery to store energy
  * 

src/dark/machines/items/ItemColoredDust.java

@@ -1,4 +1,4 @@
-package dark.machines.common.items;
+package dark.machines.items;
 
 import java.util.List;
 
@@ -10,7 +10,7 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import dark.core.prefab.ItemBasic;
 import dark.core.prefab.ModPrefab;
-import dark.machines.common.DarkMain;
+import dark.machines.DarkMain;
 
 public class ItemColoredDust extends ItemBasic
 {

src/dark/machines/items/ItemFluidCan.java

@@ -1,4 +1,4 @@
-package dark.machines.common.items;
+package dark.machines.items;
 
 import java.util.List;
 
@@ -14,9 +14,9 @@ import net.minecraftforge.fluids.ItemFluidContainer;
 import universalelectricity.core.item.ElectricItemHelper;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import dark.core.DMCreativeTab;
 import dark.core.prefab.ModPrefab;
-import dark.machines.common.DMCreativeTab;
-import dark.machines.common.DarkMain;
+import dark.machines.DarkMain;
 
 /** Small fluid can that is designed to store up to one bucket of fluid. Doesn't work like a bucket
  * as it is sealed with a pressure cap. This can is designed to work with tools or machines only.

src/dark/machines/items/ItemReadoutTools.java

@@ -1,4 +1,4 @@
-package dark.machines.common.items;
+package dark.machines.items;
 
 import java.util.List;
 
@@ -26,7 +26,7 @@ import dark.api.IToolReadOut.EnumTools;
 import dark.core.prefab.ItemBasic;
 import dark.core.prefab.ModPrefab;
 import dark.core.prefab.fluids.FluidHelper;
-import dark.machines.common.DarkMain;
+import dark.machines.DarkMain;
 
 public class ItemReadoutTools extends ItemBasic
 {

src/dark/machines/items/ItemStorageCan.java

@@ -1,4 +1,4 @@
-package dark.machines.common.items;
+package dark.machines.items;
 
 /** Can that is used to store items such as food, parts, or solid fuels.
  * 

src/dark/machines/items/ItemWrench.java

@@ -1,4 +1,4 @@
-package dark.machines.common.items;
+package dark.machines.items;
 
 import net.minecraft.block.Block;
 import net.minecraft.creativetab.CreativeTabs;
@@ -12,7 +12,7 @@ import buildcraft.api.tools.IToolWrench;
 import dark.core.interfaces.IExtraInfo.IExtraItemInfo;
 import dark.core.prefab.ItemBasic;
 import dark.core.prefab.ModPrefab;
-import dark.machines.common.DarkMain;
+import dark.machines.DarkMain;
 
 public class ItemWrench extends ItemBasic implements IToolWrench, IExtraItemInfo
 {

src/dark/machines/machines/BlockDebug.java

@@ -1,4 +1,4 @@
-package dark.machines.common.machines;
+package dark.machines.machines;
 
 import java.util.List;
 import java.util.Set;
@@ -17,10 +17,10 @@ import com.builtbroken.common.Pair;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import dark.core.DMCreativeTab;
 import dark.core.ModObjectRegistry.BlockBuildData;
 import dark.core.prefab.machine.BlockMachine;
-import dark.machines.common.DMCreativeTab;
-import dark.machines.common.DarkMain;
+import dark.machines.DarkMain;
 
 public class BlockDebug extends BlockMachine
 {

src/dark/machines/machines/BlockEnergyStorage.java

@@ -1,4 +1,4 @@
-package dark.machines.common.machines;
+package dark.machines.machines;
 
 import java.util.List;
 import java.util.Set;
@@ -18,10 +18,10 @@ import universalelectricity.core.vector.Vector3;
 
 import com.builtbroken.common.Pair;
 
+import dark.core.DMCreativeTab;
 import dark.core.prefab.machine.BlockMachine;
-import dark.machines.common.CommonProxy;
-import dark.machines.common.DMCreativeTab;
-import dark.machines.common.DarkMain;
+import dark.machines.CommonProxy;
+import dark.machines.DarkMain;
 
 /** Block for energy storage devices
  * 

src/dark/machines/machines/BlockTransformer.java

@@ -1,11 +1,11 @@
-package dark.machines.common.machines;
+package dark.machines.machines;
 
 import net.minecraft.block.material.Material;
 import net.minecraftforge.common.Configuration;
 import universalelectricity.core.UniversalElectricity;
+import dark.core.DMCreativeTab;
 import dark.core.prefab.machine.BlockMachine;
-import dark.machines.common.DMCreativeTab;
-import dark.machines.common.DarkMain;
+import dark.machines.DarkMain;
 
 public class BlockTransformer extends BlockMachine
 {

src/dark/machines/machines/ContainerBatteryBox.java

@@ -1,4 +1,4 @@
-package dark.machines.common.machines;
+package dark.machines.machines;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;

src/dark/machines/machines/ItemBlockEnergyStorage.java

@@ -0,0 +1,89 @@
+package dark.machines.machines;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+import universalelectricity.core.vector.Vector3;
+import dark.machines.CoreRecipeLoader;
+
+/** Item version of the enrgy storage block
+ *
+ * @author Darkguardsman */
+public class ItemBlockEnergyStorage extends ItemBlock
+{
+    public ItemBlockEnergyStorage(int id)
+    {
+        super(id);
+        this.setMaxDamage(0);
+        this.setHasSubtypes(true);
+    }
+
+    @Override
+    public int getMetadata(int damage)
+    {
+        return damage;
+    }
+
+    @Override
+    public String getUnlocalizedName(ItemStack itemStack)
+    {
+        return Block.blocksList[this.getBlockID()].getUnlocalizedName() + "." + itemStack.getItemDamage();
+    }
+
+    @Override
+    public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata)
+    {
+        if (!world.setBlock(x, y, z, this.getBlockID(), side, 3))
+        {
+            return false;
+        }
+
+        if (world.getBlockId(x, y, z) == this.getBlockID())
+        {
+            Block.blocksList[this.getBlockID()].onBlockPlacedBy(world, x, y, z, player, stack);
+            Block.blocksList[this.getBlockID()].onPostBlockPlaced(world, x, y, z, metadata);
+            if (stack.getTagCompound() != null && stack.getTagCompound().hasKey("wrenched"))
+            {
+                TileEntity entity = world.getBlockTileEntity(x, y, z);
+                if (entity instanceof TileEntityBatteryBox)
+                {
+                    ((TileEntityBatteryBox) entity).getInventory().loadInv(stack.getTagCompound());
+                    ((TileEntityBatteryBox) entity).setEnergyStored(stack.getTagCompound().getFloat("energy"));
+                }
+            }
+        }
+
+        return true;
+    }
+
+    public static ItemStack getWrenchedBatteryBox(World world, Vector3 vec)
+    {
+        ItemStack itemStack = new ItemStack(CoreRecipeLoader.blockBatBox);
+        TileEntity entity = vec.getTileEntity(world);
+        if (entity instanceof TileEntityBatteryBox)
+        {
+            if (itemStack.getTagCompound() == null)
+            {
+                itemStack.setTagCompound(new NBTTagCompound());
+            }
+            itemStack.getTagCompound().setBoolean("wrenched", true);
+            itemStack.getTagCompound().setFloat("energy", ((TileEntityBatteryBox) entity).getEnergyStored());
+            ((TileEntityBatteryBox) entity).getInventory().saveInv(itemStack.getTagCompound());
+            ((TileEntityBatteryBox) entity).getInventory().clear();
+        }
+        return itemStack;
+    }
+
+    public int getItemStackLimit(ItemStack stack)
+    {
+        if (stack.getTagCompound() != null && stack.getTagCompound().hasKey("wrenched"))
+        {
+            return 1;
+        }
+        return this.getItemStackLimit();
+    }
+}

src/dark/machines/machines/TileEntityBatteryBox.java

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

src/dark/machines/machines/TileEntityInfFluid.java

@@ -1,4 +1,4 @@
-package dark.machines.common.machines;
+package dark.machines.machines;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
@@ -17,9 +17,10 @@ import universalelectricity.core.vector.Vector3;
 
 import com.builtbroken.common.lang.TextHelper.TextColor;
 
+import dark.core.interfaces.IBlockActivated;
 import dark.core.prefab.fluids.FluidHelper;
 
-public class TileEntityInfFluid extends TileEntity implements IFluidHandler, IDebugTile
+public class TileEntityInfFluid extends TileEntity implements IFluidHandler, IBlockActivated
 {
     FluidTank tank = new FluidTank(Integer.MAX_VALUE);
     boolean autoEmpty = false;

src/dark/machines/machines/TileEntityInfLoad.java

@@ -1,10 +1,10 @@
-package dark.machines.common.machines;
+package dark.machines.machines;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraftforge.common.ForgeDirection;
 import dark.core.prefab.machine.TileEntityEnergyMachine;
 
-public class TileEntityInfLoad extends TileEntityEnergyMachine implements IDebugTile
+public class TileEntityInfLoad extends TileEntityEnergyMachine
 {
 
     @Override
@@ -52,12 +52,4 @@ public class TileEntityInfLoad extends TileEntityEnergyMachine implements IDebug
     {
         return Integer.MAX_VALUE;
     }
-
-    @Override
-    public boolean onActivated(EntityPlayer entityPlayer)
-    {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
 }

src/dark/machines/machines/TileEntityInfSupply.java

@@ -1,4 +1,4 @@
-package dark.machines.common.machines;
+package dark.machines.machines;
 
 import java.util.EnumSet;
 
@@ -6,7 +6,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraftforge.common.ForgeDirection;
 import dark.core.prefab.machine.TileEntityEnergyMachine;
 
-public class TileEntityInfSupply extends TileEntityEnergyMachine implements IDebugTile
+public class TileEntityInfSupply extends TileEntityEnergyMachine
 {
 
     @Override
@@ -61,12 +61,4 @@ public class TileEntityInfSupply extends TileEntityEnergyMachine implements IDeb
     {
         return 0;
     }
-
-    @Override
-    public boolean onActivated(EntityPlayer entityPlayer)
-    {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
 }

src/dark/machines/machines/TileEntityVoid.java

@@ -1,4 +1,4 @@
-package dark.machines.common.machines;
+package dark.machines.machines;
 
 import java.util.HashMap;
 
@@ -12,9 +12,9 @@ import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
 
 /** Designed to debug fluid devices by draining everything that comes in at one time
- * 
+ *
  * @author DarkGuardsman */
-public class TileEntityVoid extends TileEntity implements IFluidHandler, IDebugTile
+public class TileEntityVoid extends TileEntity implements IFluidHandler
 {
     //TODO later add to this to make it actually have an ingame use other than debug
     public static HashMap<FluidStack, Long> storage = new HashMap<FluidStack, Long>();
@@ -62,11 +62,4 @@ public class TileEntityVoid extends TileEntity implements IFluidHandler, IDebugT
         return new FluidTankInfo[] { this.tank.getInfo() };
     }
 
-    @Override
-    public boolean onActivated(EntityPlayer entityPlayer)
-    {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
 }

src/dark/machines/transmit/BlockWire.java

@@ -1,4 +1,4 @@
-package dark.machines.common.transmit;
+package dark.machines.transmit;
 
 import java.util.List;
 import java.util.Set;
@@ -24,11 +24,11 @@ import com.builtbroken.common.Pair;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import dark.core.DMCreativeTab;
 import dark.core.ModObjectRegistry.BlockBuildData;
 import dark.core.prefab.machine.BlockMachine;
+import dark.machines.DarkMain;
 import dark.machines.client.renders.RenderBlockWire;
-import dark.machines.common.DMCreativeTab;
-import dark.machines.common.DarkMain;
 
 public class BlockWire extends BlockMachine
 {

src/dark/machines/transmit/ItemBlockWire.java

@@ -1,8 +1,8 @@
-package dark.machines.common.transmit;
+package dark.machines.transmit;
 
 import net.minecraft.util.Icon;
 import dark.core.prefab.ItemBlockHolder;
-import dark.machines.common.CoreRecipeLoader;
+import dark.machines.CoreRecipeLoader;
 
 public class ItemBlockWire extends ItemBlockHolder
 {

src/dark/machines/transmit/TileEntityDetectorWire.java

@@ -1,4 +1,4 @@
-package dark.machines.common.transmit;
+package dark.machines.transmit;
 
 public class TileEntityDetectorWire extends TileEntityWire
 {

src/dark/machines/transmit/TileEntitySwitchWire.java

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

src/dark/machines/transmit/TileEntityWire.java

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