- 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.

35 files changed, 599 insertions, 580 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java
index 8a0248e85c..0208fcbd49 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java
@@ -13,8 +13,8 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Config;
 import gregtech.api.util.GT_Utility;
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.player.PlayerUtils;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import gtPlusPlus.xmod.gregtech.common.helpers.tesseract.TesseractHelper;
@@ -199,7 +199,7 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
 				final float[] tCoords = GT_Utility.getClickedFacingCoords(aSide, aX, aY, aZ);
 				switch ((byte) ((byte) (int) (tCoords[0] * 2.0F) + (2 * (byte) (int) (tCoords[1] * 2.0F)))) {
 				case 0:
-					Utils.LOG_WARNING("Freq. -1 | " + this.mFrequency);
+					Logger.WARNING("Freq. -1 | " + this.mFrequency);
 					try {
 						CORE.sTesseractGeneratorOwnershipMap.get(mOwner).remove(this.mFrequency);
 					} catch (Throwable t) {
@@ -208,7 +208,7 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
 
 					break;
 				case 1:
-					Utils.LOG_WARNING("Freq. +1 | " + this.mFrequency);
+					Logger.WARNING("Freq. +1 | " + this.mFrequency);
 					try {
 						CORE.sTesseractGeneratorOwnershipMap.get(mOwner).remove(this.mFrequency);
 					} catch (Throwable t) {
@@ -557,21 +557,21 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
 			// Set owner
 			if (PlayerUtils.getPlayersUUIDByName(this.getBaseMetaTileEntity().getOwnerName()) != null) {
 				if (this.mOwner == null) {
-					Utils.LOG_WARNING("Setting Generators Owner. 1");
+					Logger.WARNING("Setting Generators Owner. 1");
 					this.mOwner = PlayerUtils.getPlayersUUIDByName(this.getBaseMetaTileEntity().getOwnerName());
 				}
 			}
 
 			if (this.mFrequency != this.oFrequency) {
 
-				Utils.LOG_WARNING("mFreq != oFreq");
+				Logger.WARNING("mFreq != oFreq");
 
 				if (getGeneratorEntity() == this) {
 					getGeneratorEntity(this.oFrequency);
 					this.getBaseMetaTileEntity().issueBlockUpdate();
-					Utils.LOG_WARNING("this Gen == oFreq on map - do block update");
+					Logger.WARNING("this Gen == oFreq on map - do block update");
 				}
-				Utils.LOG_WARNING("mFreq will be set to oFreq");
+				Logger.WARNING("mFreq will be set to oFreq");
 				this.oFrequency = this.mFrequency;
 			}
 			if ((this.getBaseMetaTileEntity().isAllowedToWork())
@@ -586,7 +586,7 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
 				}
 			} else {
 				if (getGeneratorEntity(Integer.valueOf(this.mFrequency)) == this) {
-					Utils.LOG_WARNING("this gen == mFreq on map - do block update");
+					Logger.WARNING("this gen == mFreq on map - do block update");
 					TesseractHelper.removeGenerator(PlayerUtils.getPlayerOnServerFromUUID(mOwner), this.mFrequency);
 					this.getBaseMetaTileEntity().issueBlockUpdate();
 				}
@@ -700,7 +700,7 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
 		if (this.getBaseMetaTileEntity().getOwnerName() != null
 				&& !this.getBaseMetaTileEntity().getOwnerName().equals("")) {
 			this.mOwner = PlayerUtils.getPlayersUUIDByName(this.getBaseMetaTileEntity().getOwnerName());
-			Utils.LOG_WARNING("Setting Generators Owner. 2");
+			Logger.WARNING("Setting Generators Owner. 2");
 		}
 		super.onCreated(aStack, aWorld, aPlayer);
 	}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java
index 8c89b96adf..4363e57ad3 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java
@@ -8,8 +8,8 @@ import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.*;
 import gregtech.common.tileentities.boilers.GT_MetaTileEntity_Boiler;
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_AdvancedBoiler;
 import gtPlusPlus.xmod.gregtech.api.gui.GUI_AdvancedBoiler;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -265,7 +265,7 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler {
 			if ((this.mProcessingEnergy <= 0) && (aBaseMetaTileEntity.isAllowedToWork()) && (fuelSlot != null)) {
 
 				if (isInputFuelItem(fuelSlot) && (this.mTemperature < (maxProgresstime() - 250))) {
-					Utils.LOG_INFO("Current Heat:" + this.mTemperature + "/" + (maxProgresstime() - 250)
+					Logger.INFO("Current Heat:" + this.mTemperature + "/" + (maxProgresstime() - 250)
 							+ " Burning fuel because not yet at a suitable temp.");
 					useInputFuelItem(aBaseMetaTileEntity, fuelSlot);
 				}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java
index b9fd375fdd..086b8d291f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java
@@ -2,17 +2,13 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.generators;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.GregTech_API;
-import gregtech.api.enums.ConfigCategories;
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Textures;
+import gregtech.api.enums.*;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenerator;
 import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.*;
 import gtPlusPlus.core.lib.CORE;
 import net.minecraft.item.ItemStack;
 
@@ -38,10 +34,12 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_Basi
 		onConfigLoad();
 	}
 
+	@Override
 	public int getPollution() {
 		return (int) (2.0D * Math.pow(2.0D, this.mTier));
 	}
 
+	@Override
 	public int getCapacity() {
 		return 8000;
 	}
@@ -51,10 +49,12 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_Basi
 				"SemiFluidGenerator.efficiency.tier." + this.mTier, 100 - (this.mTier * 10));
 	}
 
+	@Override
 	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
 		return new GT_MetaTileEntity_SemiFluidGenerator(this.mName, this.mTier, this.mDescription, this.mTextures);
 	}
 
+	@Override
 	public GT_Recipe.GT_Recipe_Map getRecipes() {
 		return GT_Recipe.GT_Recipe_Map.sDenseLiquidFuels;
 	}
@@ -64,14 +64,17 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_Basi
 		return new String[]{this.mDescription, "Produces "+(this.getPollution()*20)+" pollution/sec", "Fuel Efficiency: "+this.getEfficiency() + "%", CORE.GT_Tooltip};
 	}
 
+	@Override
 	public int getEfficiency() {
 		return this.mEfficiency;
 	}
 	
+	@Override
 	public boolean isOutputFacing(byte aSide) {
 		return (aSide == getBaseMetaTileEntity().getFrontFacing());
 	}
 	
+	@Override
 	public int getFuelValue(ItemStack aStack) {
 		if ((GT_Utility.isStackInvalid(aStack)) || (getRecipes() == null))
 			return 0;
@@ -82,53 +85,63 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_Basi
 		return rValue;
 	}
 
+	@Override
 	public ITexture[] getFront(byte aColor) {
 		return new ITexture[] { super.getFront(aColor)[0],
 				new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_FRONT),
 				Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier] };
 	}
 
+	@Override
 	public ITexture[] getBack(byte aColor) {
 		return new ITexture[] { super.getBack(aColor)[0],
 				new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BACK) };
 	}
 
+	@Override
 	public ITexture[] getBottom(byte aColor) {
 		return new ITexture[] { super.getBottom(aColor)[0],
 				new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM) };
 	}
 
+	@Override
 	public ITexture[] getTop(byte aColor) {
 		return new ITexture[] { super.getTop(aColor)[0],
 				new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP) };
 	}
 
+	@Override
 	public ITexture[] getSides(byte aColor) {
 		return new ITexture[] { super.getSides(aColor)[0],
 				new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE) };
 	}
 
+	@Override
 	public ITexture[] getFrontActive(byte aColor) {
 		return new ITexture[] { super.getFrontActive(aColor)[0],
 				new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_FRONT_ACTIVE),
 				Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier] };
 	}
 
+	@Override
 	public ITexture[] getBackActive(byte aColor) {
 		return new ITexture[] { super.getBackActive(aColor)[0],
 				new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BACK_ACTIVE) };
 	}
 
+	@Override
 	public ITexture[] getBottomActive(byte aColor) {
 		return new ITexture[] { super.getBottomActive(aColor)[0],
 				new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM_ACTIVE) };
 	}
 
+	@Override
 	public ITexture[] getTopActive(byte aColor) {
 		return new ITexture[] { super.getTopActive(aColor)[0],
 				new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP_ACTIVE) };
 	}
 
+	@Override
 	public ITexture[] getSidesActive(byte aColor) {
 		return new ITexture[] { super.getSidesActive(aColor)[0],
 				new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE_ACTIVE) };
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java
index a268ade81e..2f1daa4bdf 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java
@@ -9,7 +9,7 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.objects.GT_RenderedTexture;
-import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_SolarGenerator;
 import gtPlusPlus.xmod.gregtech.api.gui.GUI_SolarGenerator;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generators.GregtechMetaSolarGenerator;
@@ -70,7 +70,7 @@ public class GregtechMetaTileEntitySolarGenerator extends GregtechMetaSolarGener
 
 			if ((aTick % 10L) == 0L) {
 
-				Utils.LOG_WARNING("getUniversalEnergyStored: "+aBaseMetaTileEntity.getUniversalEnergyStored() + "    maxEUOutput * 20 + getMinimumStoredEU: " + ((this.maxEUOutput() * 20) + this.getMinimumStoredEU()));
+				Logger.WARNING("getUniversalEnergyStored: "+aBaseMetaTileEntity.getUniversalEnergyStored() + "    maxEUOutput * 20 + getMinimumStoredEU: " + ((this.maxEUOutput() * 20) + this.getMinimumStoredEU()));
 
 				if ((this.mSolarCharge > 100) && (aBaseMetaTileEntity.isAllowedToWork()) &&
 						(!aBaseMetaTileEntity.getWorld().isThundering()) &&
@@ -80,13 +80,13 @@ public class GregtechMetaTileEntitySolarGenerator extends GregtechMetaSolarGener
 			}
 
 			if ((this.mSolarCharge < 500) && (this.mProcessingEnergy != 0) && ((aTick % 32L) == 0L)) {
-				Utils.LOG_WARNING("Adding Solar Charge. Currently "+this.mSolarCharge);
+				Logger.WARNING("Adding Solar Charge. Currently "+this.mSolarCharge);
 				this.mProcessingEnergy -= 1;
 				this.mSolarCharge += 1;
 			}
 
 			if ((this.mProcessingEnergy <= 0) && (aBaseMetaTileEntity.isAllowedToWork()) && ((aTick % 64L) == 0L) && (!aBaseMetaTileEntity.getWorld().isThundering())) {
-				Utils.LOG_WARNING("Adding Processing Energy. Currently "+this.mProcessingEnergy);
+				Logger.WARNING("Adding Processing Energy. Currently "+this.mProcessingEnergy);
 				final boolean bRain = aBaseMetaTileEntity.getWorld().isRaining() && (aBaseMetaTileEntity.getBiome().rainfall > 0.0F);
 				this.mProcessingEnergy += (bRain && (aBaseMetaTileEntity.getWorld().skylightSubtracted >= 4)) || !aBaseMetaTileEntity.getSkyAtSide((byte) 1) ? 0 : !bRain && aBaseMetaTileEntity.getWorld().isDaytime() ? 8 : 1;
 			}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java
index cb97771901..fd17c1d663 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java
@@ -7,9 +7,9 @@ import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenerator;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.*;
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.PollutionUtils;
-import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
@@ -334,22 +334,22 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator
 				this.mNewTier = mTier2;
 				//ReflectionUtils.setFinalStatic(mTier2, GT_Values.V[0]);
 			} catch (Exception e) {
-				Utils.LOG_INFO("Failed setting mTier.");
+				Logger.INFO("Failed setting mTier.");
 				e.printStackTrace();
 			}
 
 			this.mTicksToBurnFor = getTotalEUGenerated(convertDaysToTicks(tFuel.mSpecialValue), voltage);
 			if (mTicksToBurnFor >= Integer.MAX_VALUE){
 				mTicksToBurnFor = Integer.MAX_VALUE;
-				Utils.LOG_INFO("Fuel went over Int limit, setting to MAX_VALUE.");
+				Logger.INFO("Fuel went over Int limit, setting to MAX_VALUE.");
 			}
 			this.mDaysRemaining = MathUtils.roundToClosestInt(mTicksToBurnFor/20/60/3);
-			Utils.LOG_INFO("step | "+(int) (mTicksToBurnFor * getEfficiency() / 100L));
+			Logger.INFO("step | "+(int) (mTicksToBurnFor * getEfficiency() / 100L));
 			return (int) (mTicksToBurnFor * getEfficiency() / 100L);
 			//return (int) (tFuel.mSpecialValue * 365L * getEfficiency() / 100L);
 			//return tFuel.mEUt;
 		}
-		Utils.LOG_INFO("Not sure");
+		Logger.INFO("Not sure");
 		return 0;
 	}
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java
index e0f94036a7..da3b8aa551 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java
@@ -13,8 +13,8 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
 import gregtech.api.objects.GT_RenderedTexture;
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.player.PlayerUtils;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -213,8 +213,8 @@ public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_Tiered
 				}
 			}
 		} catch (Exception e) {
-			Utils.LOG_ERROR("GT_MetaTileEntity_WorldAccelerator.onPostTick.crash");
-			Utils.LOG_ERROR(e.getMessage());
+			Logger.ERROR("GT_MetaTileEntity_WorldAccelerator.onPostTick.crash");
+			Logger.ERROR(e.getMessage());
 		}
 	}
 
@@ -236,8 +236,8 @@ public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_Tiered
 				}
 			}
 		} catch (Exception e) {
-			Utils.LOG_ERROR("GT_MetaTileEntity_WorldAccelerator.doAccelerateTileEntities.crash");
-			Utils.LOG_ERROR(e.getMessage());
+			Logger.ERROR("GT_MetaTileEntity_WorldAccelerator.doAccelerateTileEntities.crash");
+			Logger.ERROR(e.getMessage());
 		}
 	}
 
@@ -316,8 +316,8 @@ public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_Tiered
 					tBlock.updateTick(pWorld, pX, pY, pZ, pRnd);
 			}
 		} catch (Exception e) {
-			Utils.LOG_ERROR("GT_MetaTileEntity_WorldAccelerator.tryTickBlock.crash");
-			Utils.LOG_ERROR(e.getMessage());
+			Logger.ERROR("GT_MetaTileEntity_WorldAccelerator.tryTickBlock.crash");
+			Logger.ERROR(e.getMessage());
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java
index 69892ea995..b99ce19031 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java
@@ -12,10 +12,10 @@ import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Utility;
 import gregtech.common.items.GT_MetaGenerated_Tool_01;
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.item.general.ItemAirFilter;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.PollutionUtils;
-import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.xmod.gregtech.api.gui.basic.CONTAINER_PollutionCleaner;
 import gtPlusPlus.xmod.gregtech.api.gui.basic.GUI_PollutionCleaner;
@@ -158,7 +158,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
 
 							//Use a Turbine
 							if(hasRotor(stackRotor) && hasAirFilter(stackFilter)){
-								Utils.LOG_WARNING("Found Turbine.");
+								Logger.WARNING("Found Turbine.");
 								mBaseEff = (int) ((50.0F + (10.0F * ((GT_MetaGenerated_Tool) stackRotor.getItem()).getToolCombatDamage(stackRotor))) * 100);
 								mOptimalAirFlow = (int) Math.max(Float.MIN_NORMAL, ((GT_MetaGenerated_Tool) stackRotor.getItem()).getToolStats(stackRotor).getSpeedMultiplier()
 										* GT_MetaGenerated_Tool.getPrimaryMaterial(stackRotor).mToolSpeed * 50);
@@ -168,8 +168,8 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
 									//Utils.LOG_WARNING("Pollution Cleaner [5]");
 
 									//Log Debug information.
-									Utils.LOG_WARNING("mBaseEff[1]:"+mBaseEff);
-									Utils.LOG_WARNING("mOptimalAirFlow[1]:"+mOptimalAirFlow);
+									Logger.WARNING("mBaseEff[1]:"+mBaseEff);
+									Logger.WARNING("mOptimalAirFlow[1]:"+mOptimalAirFlow);
 
 									//Calculate The Voltage we are running
 									long tVoltage = maxEUInput();
@@ -182,7 +182,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
 									//If no sides are free, how will you process the atmosphere?
 									if (mAirSides > 0){
 										mPollutionReduction += (((mTier*2)*100)*mAirSides); //Was originally *100
-										Utils.LOG_WARNING("mPollutionReduction[1]:"+mPollutionReduction);
+										Logger.WARNING("mPollutionReduction[1]:"+mPollutionReduction);
 
 										//I stole this code
 										mPollutionReduction = (MathUtils.safeInt((long)mPollutionReduction*this.mBaseEff)/100000)*mAirSides;
@@ -193,7 +193,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
 										//Set a temp to remove variable to aleviate duplicate code.
 										int toRemove = 0;
 
-										Utils.LOG_WARNING("mCurrentPollution[4]:"+mCurrentPollution);
+										Logger.WARNING("mCurrentPollution[4]:"+mCurrentPollution);
 										if (mPollutionReduction <= mCurrentPollution){
 											//Clean some Air.
 											toRemove = mPollutionReduction;
@@ -207,10 +207,10 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
 										if (toRemove > 0){
 											if (damageTurbineRotor() && damageAirFilter()){
 												removePollution(toRemove);	
-												Utils.LOG_WARNING("mNewPollution[4]:"+getCurrentChunkPollution());		
+												Logger.WARNING("mNewPollution[4]:"+getCurrentChunkPollution());		
 											}
 											else {
-												Utils.LOG_WARNING("Could not damage turbine rotor or Air Filter.");
+												Logger.WARNING("Could not damage turbine rotor or Air Filter.");
 												aBaseMetaTileEntity.setActive(false);
 											}
 										} //End of pollution removal block.								
@@ -271,16 +271,16 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
 					}
 				}
 
-				Utils.LOG_WARNING("Trying to do "+damageValue+" damage to the rotor.");
+				Logger.WARNING("Trying to do "+damageValue+" damage to the rotor.");
 
 				//Damage Rotor
 				//int rotorDurability = this.mInventory[this.SLOT_ROTOR].getItemDamage();
 				long rotorDamage = GT_MetaGenerated_Tool.getToolDamage(this.mInventory[this.SLOT_ROTOR]);
 				long rotorDurabilityMax = GT_MetaGenerated_Tool.getToolMaxDamage(this.mInventory[this.SLOT_ROTOR]);
 				long rotorDurability = (rotorDurabilityMax - rotorDamage);
-				Utils.LOG_WARNING("Rotor Damage: "+rotorDamage + " | Max Durability: "+rotorDurabilityMax+" | "+" Remaining Durability: "+rotorDurability);
+				Logger.WARNING("Rotor Damage: "+rotorDamage + " | Max Durability: "+rotorDurabilityMax+" | "+" Remaining Durability: "+rotorDurability);
 				if (rotorDurability > damageValue){
-					Utils.LOG_WARNING("Damaging Rotor.");
+					Logger.WARNING("Damaging Rotor.");
 					GT_ModHandler.damageOrDechargeItem(this.mInventory[this.SLOT_ROTOR], (int) damageValue, 0, null);
 
 					long tempDur = GT_MetaGenerated_Tool.getToolDamage(this.mInventory[this.SLOT_ROTOR]);
@@ -293,14 +293,14 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
 				}
 
 				if (rotorDurability <= 0) {
-					Utils.LOG_WARNING("Destroying Rotor.");
+					Logger.WARNING("Destroying Rotor.");
 					this.mInventory[this.SLOT_ROTOR] = null;
 					return false;
 				}
 
 
 			}else {
-				Utils.LOG_WARNING("Bad Rotor.");
+				Logger.WARNING("Bad Rotor.");
 				return false;
 			}
 		}
@@ -369,7 +369,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
 			el