2 files changed, 14 insertions, 21 deletions
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);