Removing shit from Binnies packages.

16 files changed, 97 insertions, 157 deletions

diff --git a/src/Java/binnie/core/machines/BlockMachine.java b/src/Java/binnie/core/machines/BlockMachine.java
index 042e213aec..e2ad883207 100644
--- a/src/Java/binnie/core/machines/BlockMachine.java
+++ b/src/Java/binnie/core/machines/BlockMachine.java
@@ -1,14 +1,9 @@
 package binnie.core.machines;
 
-import binnie.Binnie;
-import binnie.core.BinnieCore;
-import binnie.core.machines.component.IRender.RandomDisplayTick;
-import binnie.core.proxy.BinnieProxy;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
@@ -16,7 +11,6 @@ import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.PlayerCapabilities;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -24,6 +18,11 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
+import binnie.Binnie;
+import binnie.core.BinnieCore;
+import binnie.core.machines.component.IRender;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 class BlockMachine
   extends BlockContainer
diff --git a/src/Java/binnie/core/machines/Machine.java b/src/Java/binnie/core/machines/Machine.java
index 474b32c627..70dc65c485 100644
--- a/src/Java/binnie/core/machines/Machine.java
+++ b/src/Java/binnie/core/machines/Machine.java
@@ -1,27 +1,11 @@
 package binnie.core.machines;
 
-import binnie.core.BinnieCore;
-import binnie.core.machines.component.IInteraction.RightClick;
-import binnie.core.machines.component.IRender.DisplayTick;
-import binnie.core.machines.network.INetwork.GuiNBT;
-import binnie.core.machines.network.INetwork.RecieveGuiNBT;
-import binnie.core.machines.network.INetwork.SendGuiNBT;
-import binnie.core.machines.network.INetwork.TilePacketSync;
-import binnie.core.machines.power.ITankMachine;
-import binnie.core.network.BinnieCorePacketID;
-import binnie.core.network.INetworkedEntity;
-import binnie.core.network.packet.MessageTileNBT;
-import binnie.core.network.packet.PacketPayload;
-import binnie.core.proxy.BinnieProxy;
-import com.mojang.authlib.GameProfile;
-import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
-import cpw.mods.fml.relauncher.Side;
-import forestry.api.core.INBTTagable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.nbt.NBTTagCompound;
@@ -29,6 +13,20 @@ import net.minecraft.nbt.NBTUtil;
 import net.minecraft.network.Packet;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
+import binnie.core.BinnieCore;
+import binnie.core.machines.component.IInteraction;
+import binnie.core.machines.component.IRender;
+import binnie.core.machines.network.INetwork;
+import binnie.core.machines.power.ITankMachine;
+import binnie.core.network.BinnieCorePacketID;
+import binnie.core.network.INetworkedEntity;
+import binnie.core.network.packet.MessageTileNBT;
+import binnie.core.network.packet.PacketPayload;
+
+import com.mojang.authlib.GameProfile;
+
+import cpw.mods.fml.relauncher.Side;
+import forestry.api.core.INBTTagable;
 
 public class Machine
   implements INetworkedEntity, INBTTagable, INetwork.TilePacketSync, IMachine, INetwork.GuiNBT
@@ -67,7 +65,7 @@ public class Machine
     return this.componentMap.values();
   }
   
-  public <T extends MachineComponent> T getComponent(Class<T> componentClass)
+  public <T extends MachineComponent> MachineComponent getComponent(Class<T> componentClass)
   {
     return hasComponent(componentClass) ? (MachineComponent)componentClass.cast(this.componentMap.get(componentClass)) : null;
   }
diff --git a/src/Java/binnie/core/machines/TileEntityMachine.java b/src/Java/binnie/core/machines/TileEntityMachine.java
index c6acf1fda8..27038b1c1c 100644
--- a/src/Java/binnie/core/machines/TileEntityMachine.java
+++ b/src/Java/binnie/core/machines/TileEntityMachine.java
@@ -1,13 +1,12 @@
 package binnie.core.machines;
 
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.network.Packet;
 import binnie.Binnie;
 import binnie.core.machines.base.TileEntityMachineBase;
-import binnie.core.machines.component.IInteraction.ChunkUnload;
-import binnie.core.machines.component.IInteraction.Invalidation;
+import binnie.core.machines.component.IInteraction;
 import binnie.core.network.INetworkedEntity;
 import binnie.core.network.packet.PacketPayload;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.Packet;
 
 public class TileEntityMachine
   extends TileEntityMachineBase
diff --git a/src/Java/binnie/core/machines/base/DefaultPower.java b/src/Java/binnie/core/machines/base/DefaultPower.java
index 5d3e143b2b..527ce0801a 100644
--- a/src/Java/binnie/core/machines/base/DefaultPower.java
+++ b/src/Java/binnie/core/machines/base/DefaultPower.java
@@ -1,11 +1,10 @@
 package binnie.core.machines.base;
 
+import net.minecraft.tileentity.TileEntity;
+import net.minecraftforge.common.util.ForgeDirection;
 import binnie.core.machines.power.IPoweredMachine;
 import binnie.core.machines.power.PowerInfo;
 import binnie.core.machines.power.PowerInterface;
-import cpw.mods.fml.common.Optional.Method;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.common.util.ForgeDirection;
 
 class DefaultPower
   implements IPoweredMachine
@@ -15,25 +14,25 @@ class DefaultPower
     return new PowerInfo(this, 0.0F);
   }
   
-  @Optional.Method(modid="IC2")
+ 
   public double getDemandedEnergy()
   {
     return 0.0D;
   }
   
-  @Optional.Method(modid="IC2")
+
   public int getSinkTier()
   {
     return 0;
   }
   
-  @Optional.Method(modid="IC2")
+
   public double injectEnergy(ForgeDirection directionFrom, double amount, double voltage)
   {
     return 0.0D;
   }
   
-  @Optional.Method(modid="IC2")
+
   public boolean acceptsEnergyFrom(TileEntity emitter, ForgeDirection direction)
   {
     return false;
diff --git a/src/Java/binnie/core/machines/base/TileEntityMachineBase.java b/src/Java/binnie/core/machines/base/TileEntityMachineBase.java
index 927671b67a..471bb4ab68 100644
--- a/src/Java/binnie/core/machines/base/TileEntityMachineBase.java
+++ b/src/Java/binnie/core/machines/base/TileEntityMachineBase.java
@@ -1,23 +1,21 @@
 package binnie.core.machines.base;
 
-import binnie.core.machines.Machine;
-import binnie.core.machines.inventory.IInventoryMachine;
-import binnie.core.machines.inventory.TankSlot;
-import binnie.core.machines.power.IPoweredMachine;
-import binnie.core.machines.power.ITankMachine;
-import binnie.core.machines.power.PowerInfo;
-import binnie.core.machines.power.PowerInterface;
-import binnie.core.machines.power.TankInfo;
-import cpw.mods.fml.common.Optional.Method;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidTank;
+import binnie.core.machines.Machine;
+import binnie.core.machines.inventory.IInventoryMachine;
+import binnie.core.machines.inventory.TankSlot;
+import binnie.core.machines.power.IPoweredMachine;
+import binnie.core.machines.power.ITankMachine;
+import binnie.core.machines.power.PowerInfo;
+import binnie.core.machines.power.PowerInterface;
+import binnie.core.machines.power.TankInfo;
 
 public class TileEntityMachineBase
   extends TileEntity
@@ -206,25 +204,21 @@ public class TileEntityMachineBase
     return getTankContainer().getTanks();
   }
   
-  @Optional.Method(modid="IC2")
   public double getDemandedEnergy()
   {
     return getPower().getDemandedEnergy();
   }
   
-  @Optional.Method(modid="IC2")
   public int getSinkTier()
   {
     return getPower().getSinkTier();
   }
   
-  @Optional.Method(modid="IC2")
   public double injectEnergy(ForgeDirection directionFrom, double amount, double voltage)
   {
     return getPower().injectEnergy(directionFrom, amount, voltage);
   }
   
-  @Optional.Method(modid="IC2")
   public boolean acceptsEnergyFrom(TileEntity emitter, ForgeDirection direction)
   {
     return getPower().acceptsEnergyFrom(emitter, direction);
diff --git a/src/Java/binnie/core/machines/inventory/ComponentChargedSlots.java b/src/Java/binnie/core/machines/inventory/ComponentChargedSlots.java
index 078a2f98d5..ceaab46538 100644
--- a/src/Java/binnie/core/machines/inventory/ComponentChargedSlots.java
+++ b/src/Java/binnie/core/machines/inventory/ComponentChargedSlots.java
@@ -1,18 +1,16 @@
 package binnie.core.machines.inventory;
 
-import binnie.core.machines.Machine;
-import binnie.core.machines.MachineComponent;
-import binnie.core.machines.MachineUtil;
-import binnie.core.machines.network.INetwork.GuiNBT;
-import cpw.mods.fml.relauncher.Side;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
+import binnie.core.machines.Machine;
+import binnie.core.machines.MachineComponent;
+import binnie.core.machines.network.INetwork;
+import cpw.mods.fml.relauncher.Side;
 
 public class ComponentChargedSlots
   extends MachineComponent
diff --git a/src/Java/binnie/core/machines/inventory/ComponentInventoryTransfer.java b/src/Java/binnie/core/machines/inventory/ComponentInventoryTransfer.java
index 8ee10080e8..e8bbf00f88 100644
--- a/src/Java/binnie/core/machines/inventory/ComponentInventoryTransfer.java
+++ b/src/Java/binnie/core/machines/inventory/ComponentInventoryTransfer.java
@@ -1,12 +1,13 @@
 package binnie.core.machines.inventory;
 
-import binnie.core.machines.IMachine;
-import binnie.core.machines.MachineComponent;
-import binnie.core.machines.transfer.TransferRequest;
 import java.util.ArrayList;
 import java.util.List;
+
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
+import binnie.core.machines.IMachine;
+import binnie.core.machines.MachineComponent;
+import binnie.core.machines.transfer.TransferRequest;
 
 public class ComponentInventoryTransfer
   extends MachineComponent
@@ -62,7 +63,7 @@ public class ComponentInventoryTransfer
     
     private Restock(IMachine machine, int[] buffer, int destination, int limit)
     {
-      super(machine, null);
+      super(machine);
       this.buffer = buffer;
       this.destination = destination;
       this.limit = limit;
@@ -99,7 +100,7 @@ public class ComponentInventoryTransfer
     
     private Storage(IMachine machine, int source, int[] destination)
     {
-      super(machine, null);
+      super(machine);
       this.source = source;
       this.destination = destination;
     }
@@ -122,22 +123,22 @@ public class ComponentInventoryTransfer
   
   public void addRestock(int[] buffer, int destination, int limit)
   {
-    this.transfers.add(new Restock(getMachine(), buffer, destination, limit, null));
+    this.transfers.add(new Restock(getMachine(), buffer, destination, limit));
   }
   
   public void addRestock(int[] buffer, int destination)
   {
-    this.transfers.add(new Restock(getMachine(), buffer, destination, null));
+    this.transfers.add(new Restock(getMachine(), buffer, destination));
   }
   
   public void addStorage(int source, int[] destination)
   {
-    this.transfers.add(new Storage(getMachine(), source, destination, null));
+    this.transfers.add(new Storage(getMachine(), source, destination));
   }
   
   public void performTransfer(int source, int[] destination)
   {
-    new Storage(getMachine(), source, destination, null).transfer((IInventory)getMachine().getInterface(IInventoryMachine.class));
+    new Storage(getMachine(), source, destination).transfer((IInventory)getMachine().getInterface(IInventoryMachine.class));
   }
   
   public void onUpdate()
@@ -149,7 +150,7 @@ public class ComponentInventoryTransfer
   
   public void addStorage(int source, int[] destination, Condition condition)
   {
-    this.transfers.add(new Storage(getMachine(), source, destination, null).setCondition(condition));
+    this.transfers.add(new Storage(getMachine(), source, destination).setCondition(condition));
   }
   
   public static abstract class Condition
diff --git a/src/Java/binnie/core/machines/inventory/SlotValidator.java b/src/Java/binnie/core/machines/inventory/SlotValidator.java
index 952ff99761..0e0aab4e03 100644
--- a/src/Java/binnie/core/machines/inventory/SlotValidator.java
+++ b/src/Java/binnie/core/machines/inventory/SlotValidator.java
@@ -1,10 +1,8 @@
 package binnie.core.machines.inventory;
 
-import binnie.core.resource.BinnieIcon;
-import forestry.api.genetics.AlleleManager;
-import forestry.api.genetics.IAlleleRegistry;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
+import forestry.api.genetics.AlleleManager;
 
 public abstract class SlotValidator
   extends Validator<ItemStack>
@@ -32,7 +30,7 @@ public abstract class SlotValidator
     
     public Item(ItemStack target, ValidatorIcon icon)
     {
-      super();
+      super(icon);
       this.target = target;
     }
     
@@ -52,7 +50,7 @@ public abstract class SlotValidator
   {
     public Individual()
     {
-      super();
+      super(IconBee);
     }
     
     public boolean isValid(ItemStack itemStack)
diff --git a/src/Java/binnie/core/machines/inventory/TankValidator.java b/src/Java/binnie/core/machines/inventory/TankValidator.java
deleted file mode 100644
index 07c8f2f9c9..0000000000
--- a/src/Java/binnie/core/machines/inventory/TankValidator.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package binnie.core.machines.inventory;
-
-import binnie.Binnie;
-import binnie.core.liquid.ManagerLiquid;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
-
-public abstract class TankValidator
-  extends Validator<FluidStack>
-{
-  public abstract boolean isValid(FluidStack paramFluidStack);
-  
-  public static class Basic
-    extends TankValidator
-  {
-    private Fluid fluid;
-    
-    public Basic(String name)
-    {
-      this.fluid = Binnie.Liquid.getLiquidStack(name, 1).getFluid();
-    }
-    
-    public boolean isValid(FluidStack stack)
-    {
-      return new FluidStack(this.fluid, 1).isFluidEqual(stack);
-    }
-    
-    public String getTooltip()
-    {
-      return new FluidStack(this.fluid, 1).getLocalizedName();
-    }
-  }
-}
diff --git a/src/Java/binnie/core/machines/power/ComponentPowerReceptor.java b/src/Java/binnie/core/machines/power/ComponentPowerReceptor.java
index 217af86c43..5392ea7012 100644
--- a/src/Java/binnie/core/machines/power/ComponentPowerReceptor.java
+++ b/src/Java/binnie/core/machines/power/ComponentPowerReceptor.java
@@ -1,28 +1,24 @@
 package binnie.core.machines.power;
 
-import binnie.core.Mods;
-import binnie.core.Mods.Mod;
-import binnie.core.machines.IMachine;
-import binnie.core.machines.MachineComponent;
-import binnie.core.machines.component.IBuildcraft.TriggerProvider;
-import binnie.core.machines.component.IInteraction.ChunkUnload;
-import binnie.core.machines.component.IInteraction.Invalidation;
-import binnie.core.triggers.TriggerData;
-import binnie.core.triggers.TriggerPower;
-import cpw.mods.fml.common.Optional.Interface;
-import cpw.mods.fml.common.Optional.Method;
-import cpw.mods.fml.common.eventhandler.EventBus;
 import ic2.api.energy.event.EnergyTileLoadEvent;
 import ic2.api.energy.event.EnergyTileUnloadEvent;
 import ic2.api.energy.tile.IEnergyTile;
+
 import java.util.LinkedList;
 import java.util.List;
+
+import miscutil.core.lib.LoadedMods;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.util.ForgeDirection;
+import binnie.core.machines.IMachine;
+import binnie.core.machines.MachineComponent;
+import binnie.core.machines.component.IBuildcraft;
+import binnie.core.machines.component.IInteraction;
+import binnie.core.triggers.TriggerData;
+import binnie.core.triggers.TriggerPower;
 
-@Optional.Interface(iface="binnie.core.machines.component.IBuildcraft.TriggerProvider", modid="BuildCraft|Silicon")
 public class ComponentPowerReceptor
   extends MachineComponent
   implements IPoweredMachine, IBuildcraft.TriggerProvider, IInteraction.ChunkUnload, IInteraction.Invalidation
@@ -74,7 +70,6 @@ public class ComponentPowerReceptor
     return new PowerInfo(this, 0.0F);
   }
   
-  @Optional.Method(modid="BuildCraft|Silicon")
   public final void getTriggers(List<TriggerData> triggers)
   {
     triggers.add(TriggerPower.powerNone(this));
@@ -84,26 +79,25 @@ public class ComponentPowerReceptor
     triggers.add(TriggerPower.powerFull(this));
   }
   
-  @Optional.Method(modid="IC2")
   public double getDemandedEnergy()
   {
     return this.container.getEnergySpace(PowerSystem.EU);
   }
   
-  @Optional.Method(modid="IC2")
+
   public int getSinkTier()
   {
     return 1;
   }
   
-  @Optional.Method(modid="IC2")
+
   public double injectEnergy(ForgeDirection directionFrom, double amount, double voltage)
   {
     this.container.addEnergy(PowerSystem.EU, amount, true);
     return 0.0D;
   }
   
-  @Optional.Method(modid="IC2")
+
   public boolean acceptsEnergyFrom(TileEntity emitter, ForgeDirection direction)
   {
     return acceptsPowerSystem(PowerSystem.EU);
@@ -160,7 +154,7 @@ public class ComponentPowerReceptor
     if (getMachine().getWorld() == null) {
       return;
     }
-    if (Mods.IC2.active()) {
+    if (LoadedMods.IndustrialCraft2) {
       do_addToEnergyNet();
     }
   }
@@ -170,19 +164,17 @@ public class ComponentPowerReceptor
     if (getMachine().getWorld() == null) {
       return;
     }
-    if (Mods.IC2.active()) {
+    if (LoadedMods.IndustrialCraft2) {
       do_removeFromEnergyNet();
     }
   }
   
-  @Optional.Method(modid="IC2")
   private void do_addToEnergyNet()
   {
     MinecraftForge.EVENT_BUS.post(new EnergyTileLoadEvent((IEnergyTile)getMachine().getTileEntity()));
     this.registeredToIC2EnergyNet = true;
   }
   
-  @Optional.Method(modid="IC2")
   private void do_removeFromEnergyNet()
   {
     MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent((IEnergyTile)getMachine().getTileEntity()));
diff --git a/src/Java/binnie/core/machines/power/ComponentProcessIndefinate.java b/src/Java/binnie/core/machines/power/ComponentProcessIndefinate.java
index f1442107f4..b4c81e0d62 100644
--- a/src/Java/binnie/core/machines/power/ComponentProcessIndefinate.java
+++ b/src/Java/binnie/core/machines/power/ComponentProcessIndefinate.java
@@ -1,10 +1,9 @@
 package binnie.core.machines.power;
 
+import net.minecraft.nbt.NBTTagCompound;
 import binnie.core.machines.IMachine;
 import binnie.core.machines.MachineComponent;
-import binnie.core.machines.MachineUtil;
-import binnie.core.machines.network.INetwork.TilePacketSync;
-import net.minecraft.nbt.NBTTagCompound;
+import binnie.core.machines.network.INetwork;
 
 public abstract class ComponentProcessIndefinate
   extends MachineComponent
diff --git a/src/Java/binnie/core/machines/power/ErrorState.java b/src/Java/binnie/core/machines/power/ErrorState.java
index 03ed4de1f0..65a3946829 100644
--- a/src/Java/binnie/core/machines/power/ErrorState.java
+++ b/src/Java/binnie/core/machines/power/ErrorState.java
@@ -1,7 +1,7 @@
 package binnie.core.machines.power;
 
-import forestry.api.core.INBTTagable;
 import net.minecraft.nbt.NBTTagCompound;
+import forestry.api.core.INBTTagable;
 
 public class ErrorState
   implements INBTTagable
@@ -54,7 +54,7 @@ public class ErrorState
   {
     public Item(String name, String desc, int[] slots)
     {
-      super(desc, slots);
+      super(name, desc, slots);
     }
   }
   
@@ -63,7 +63,7 @@ public class ErrorState
   {
     public Tank(String name, String desc, int[] slots)
     {
-      super(desc, slots);
+      super(name, desc, slots);
     }
   }
   
@@ -77,7 +77,7 @@ public class ErrorState
     
     public NoItem(String desc, int[] slots)
     {
-      super(desc, slots);
+      super("null", desc, slots);
     }
   }
   
@@ -91,7 +91,7 @@ public class ErrorState
     
     public InvalidItem(String name, String desc, int slot)
     {
-      super(desc, new int[] { slot });
+      super(name, desc, new int[] { slot });
     }
   }
   
@@ -100,7 +100,7 @@ public class ErrorState
   {
     public NoSpace(String desc, int[] slots)
     {
-      super(desc, slots);
+      super("null", desc, slots);
     }
   }
   
@@ -109,7 +109,7 @@ public class ErrorState
   {
     public InsufficientPower()
     {
-      super("Not enough power to operate");
+      super("Not enough power to operate", ".");
     }
   }
   
@@ -118,7 +118,7 @@ public class ErrorState
   {
     public TankSpace(String desc, int tank)
     {
-      super(desc, new int[] { tank });
+      super("null", desc, new int[] { tank });
     }
   }
   
@@ -127,7 +127,7 @@ public class ErrorState
   {
     public InsufficientLiquid(String desc, int tank)
     {
-      super(desc, new int[] { tank });
+      super("null", desc, new int[] { tank });
     }
   }
   
@@ -136,7 +136,7 @@ public class ErrorState
   {
     public InvalidRecipe(String string, int[] slots)
     {
-      super(string, slots);
+      super("null", string, slots);
     }
   }
   
diff --git a/src/Java/binnie/core/machines/power/IPoweredMachine.java b/src/Java/binnie/core/machines/power/IPoweredMachine.java
index b5e57aeff0..61b505e3d3 100644
--- a/src/Java/binnie/core/machines/power/IPoweredMachine.java
+++ b/src/Java/binnie/core/machines/power/IPoweredMachine.java
@@ -1,10 +1,8 @@
 package binnie.core.machines.power;
 
-import cofh.api.energy.IEnergyHandler;
-import cpw.mods.fml.common.Optional.Interface;
 import ic2.api.energy.tile.IEnergySink;
+import cofh.api.energy.IEnergyHandler;
 
-@Optional.Interface(iface="ic2.api.energy.tile.IEnergySink", modid="IC2")
 public abstract interface IPoweredMachine
   extends IEnergySink, IEnergyHandler
 {
diff --git a/src/Java/binnie/core/machines/storage/Compartment.java b/src/Java/binnie/core/machines/storage/Compartment.java
index d7694e2502..4ed8406346 100644
--- a/src/Java/binnie/core/machines/storage/Compartment.java
+++ b/src/Java/binnie/core/machines/storage/Compartment.java
@@ -1,16 +1,15 @@
 package binnie.core.machines.storage;
 
+import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
 import binnie.core.BinnieCore;
 import binnie.core.machines.IMachineType;
 import binnie.core.machines.Machine;
-import binnie.core.machines.MachineGroup;
 import binnie.core.machines.MachinePackage;
 import binnie.core.machines.TileEntityMachine;
 import binnie.core.resource.BinnieResource;
 import binnie.core.resource.IBinnieTexture;
-import net.minecraft.client.renderer.RenderBlocks;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
 
  enum Compartment
   implements IMachineType
@@ -36,7 +35,7 @@ import net.minecraft.tileentity.TileEntity;
     
     protected PackageCompartment(String uid, IBinnieTexture renderTexture)
     {
-      super(false);
+      super(uid, false);
       this.renderTexture = renderTexture.getTexture();
     }
     
diff --git a/src/Java/binnie/core/machines/storage/ComponentBinnieCoreGUI.java b/src/Java/binnie/core/machines/storage/ComponentBinnieCoreGUI.java
index d987129378..abb2307687 100644
--- a/src/Java/binnie/core/machines/storage/ComponentBinnieCoreGUI.java
+++ b/src/Java/binnie/core/machines/storage/ComponentBinnieCoreGUI.java
@@ -1,13 +1,12 @@
 package binnie.core.machines.storage;
 
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.world.World;
 import binnie.core.BinnieCore;
 import binnie.core.gui.BinnieCoreGUI;
 import binnie.core.machines.Machine;
 import binnie.core.machines.MachineComponent;
-import binnie.core.machines.component.IInteraction.RightClick;
-import binnie.core.proxy.BinnieProxy;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.world.World;
+import binnie.core.machines.component.IInteraction;
 
 class ComponentBinnieCoreGUI
   extends MachineComponent
diff --git a/src/Java/binnie/core/machines/storage/ComponentCompartmentInventory.java b/src/Java/binnie/core/machines/storage/ComponentCompartmentInventory.java
index ef55e9df9e..efe77be7e7 100644
--- a/src/Java/binnie/core/machines/storage/ComponentCompartmentInventory.java
+++ b/src/Java/binnie/core/machines/storage/ComponentCompartmentInventory.java
@@ -1,15 +1,15 @@
 package binnie.core.machines.storage;
 
-import binnie.core.machines.IMachine;
-import binnie.core.machines.inventory.ComponentInventorySlots;
-import binnie.core.machines.network.INetwork.GuiNBT;
-import cpw.mods.fml.relauncher.Side;
 import java.util.HashMap;
 import java.util.Map;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
-import net.minecraft.tileentity.TileEntity;
+import binnie.core.machines.IMachine;
+import binnie.core.machines.inventory.ComponentInventorySlots;
+import binnie.core.machines.network.INetwork;
+import cpw.mods.fml.relauncher.Side;
 
 class ComponentCompartmentInventory
   extends ComponentInventorySlots