- Disabled some logging.

% Minor Project Clean-up, added missing Override annotations to 100+ methods & removed pointless casts.
% Moved Logging to it's own class.
$ Fixed Multi-block handling of Pollution.
$ Fixed the GT 5.09 material enabler system. (From My Side, it's still borked on GTs).
+ Added a Dynamic Proxy invocation for IMaterialHandler.
+ Added an AutoMap data type, which is a Auto-incremental ID'd Hashmap wrapper.

4 files changed, 42 insertions, 23 deletions

diff --git a/src/Java/cofh/energy/EnergyStorage.java b/src/Java/cofh/energy/EnergyStorage.java
index e48fc7b8ac..c29b1a814f 100644
--- a/src/Java/cofh/energy/EnergyStorage.java
+++ b/src/Java/cofh/energy/EnergyStorage.java
@@ -99,7 +99,8 @@ public class EnergyStorage
     }
   }
   
-  public int receiveEnergy(int maxReceive, boolean simulate)
+  @Override
+public int receiveEnergy(int maxReceive, boolean simulate)
   {
     int energyReceived = Math.min(this.capacity - this.energy, Math.min(this.maxReceive, maxReceive));
     if (!simulate) {
@@ -108,7 +109,8 @@ public class EnergyStorage
     return energyReceived;
   }
   
-  public int extractEnergy(int maxExtract, boolean simulate)
+  @Override
+public int extractEnergy(int maxExtract, boolean simulate)
   {
     int energyExtracted = Math.min(this.energy, Math.min(this.maxExtract, maxExtract));
     if (!simulate) {
@@ -117,12 +119,14 @@ public class EnergyStorage
     return energyExtracted;
   }
   
-  public int getEnergyStored()
+  @Override
+public int getEnergyStored()
   {
     return this.energy;
   }
   
-  public int getMaxEnergyStored()
+  @Override
+public int getMaxEnergyStored()
   {
     return this.capacity;
   }
diff --git a/src/Java/cofh/energy/IEnergyHandler.java b/src/Java/cofh/energy/IEnergyHandler.java
index 89ea0b4eb7..81424a971f 100644
--- a/src/Java/cofh/energy/IEnergyHandler.java
+++ b/src/Java/cofh/energy/IEnergyHandler.java
@@ -3,13 +3,17 @@ package cofh.energy;
 import net.minecraftforge.common.util.ForgeDirection;
 
 public abstract interface IEnergyHandler
-  extends IEnergyProvider, IEnergyReceiver
+extends IEnergyProvider, IEnergyReceiver
 {
-  public abstract int receiveEnergy(ForgeDirection paramForgeDirection, int paramInt, boolean paramBoolean);
-  
-  public abstract int extractEnergy(ForgeDirection paramForgeDirection, int paramInt, boolean paramBoolean);
-  
-  public abstract int getEnergyStored(ForgeDirection paramForgeDirection);
-  
-  public abstract int getMaxEnergyStored(ForgeDirection paramForgeDirection);
+	@Override
+	public abstract int receiveEnergy(ForgeDirection paramForgeDirection, int paramInt, boolean paramBoolean);
+
+	@Override
+	public abstract int extractEnergy(ForgeDirection paramForgeDirection, int paramInt, boolean paramBoolean);
+
+	@Override
+	public abstract int getEnergyStored(ForgeDirection paramForgeDirection);
+
+	@Override
+	public abstract int getMaxEnergyStored(ForgeDirection paramForgeDirection);
 }
diff --git a/src/Java/cofh/energy/ItemEnergyContainer.java b/src/Java/cofh/energy/ItemEnergyContainer.java
index 697532abe3..3467aeaf03 100644
--- a/src/Java/cofh/energy/ItemEnergyContainer.java
+++ b/src/Java/cofh/energy/ItemEnergyContainer.java
@@ -53,7 +53,8 @@ public class ItemEnergyContainer
     this.maxExtract = maxExtract;
   }
   
-  public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate)
+  @Override
+public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate)
   {
     if (container.stackTagCompound == null) {
       container.stackTagCompound = new NBTTagCompound();
@@ -68,7 +69,8 @@ public class ItemEnergyContainer
     return energyReceived;
   }
   
-  public int extractEnergy(ItemStack container, int maxExtract, boolean simulate)
+  @Override
+public int extractEnergy(ItemStack container, int maxExtract, boolean simulate)
   {
     if ((container.stackTagCompound == null) || (!container.stackTagCompound.hasKey("Energy"))) {
       return 0;
@@ -83,7 +85,8 @@ public class ItemEnergyContainer
     return energyExtracted;
   }
   
-  public int getEnergyStored(ItemStack container)
+  @Override
+public int getEnergyStored(ItemStack container)
   {
     if ((container.stackTagCompound == null) || (!container.stackTagCompound.hasKey("Energy"))) {
       return 0;
@@ -91,7 +94,8 @@ public class ItemEnergyContainer
     return container.stackTagCompound.getInteger("Energy");
   }
   
-  public int getMaxEnergyStored(ItemStack container)
+  @Override
+public int getMaxEnergyStored(ItemStack container)
   {
     return this.capacity;
   }
diff --git a/src/Java/cofh/energy/TileEnergyHandler.java b/src/Java/cofh/energy/TileEnergyHandler.java
index 24cd3c0e34..f8e3ea4291 100644
--- a/src/Java/cofh/energy/TileEnergyHandler.java
+++ b/src/Java/cofh/energy/TileEnergyHandler.java
@@ -10,39 +10,46 @@ public class TileEnergyHandler
 {
   protected EnergyStorage storage = new EnergyStorage(32000);
   
-  public void readFromNBT(NBTTagCompound nbt)
+  @Override
+public void readFromNBT(NBTTagCompound nbt)
   {
     super.readFromNBT(nbt);
     this.storage.readFromNBT(nbt);
   }
   
-  public void writeToNBT(NBTTagCompound nbt)
+  @Override
+public void writeToNBT(NBTTagCompound nbt)
   {
     super.writeToNBT(nbt);
     this.storage.writeToNBT(nbt);
   }
   
-  public boolean canConnectEnergy(ForgeDirection from)
+  @Override
+public boolean canConnectEnergy(ForgeDirection from)
   {
     return true;
   }
   
-  public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate)
+  @Override
+public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate)
   {
     return this.storage.receiveEnergy(maxReceive, simulate);
   }
   
-  public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate)
+  @Override
+public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate)
   {
     return this.storage.extractEnergy(maxExtract, simulate);
   }
   
-  public int getEnergyStored(ForgeDirection from)
+  @Override
+public int getEnergyStored(ForgeDirection from)
   {
     return this.storage.getEnergyStored();
   }
   
-  public int getMaxEnergyStored(ForgeDirection from)
+  @Override
+public int getMaxEnergyStored(ForgeDirection from)
   {
     return this.storage.getMaxEnergyStored();
   }