> Why does Git make me do these? arghhh...

Merge branch 'master' of https://github.com/draknyte1/GTplusplus

# Conflicts:
#	src/Java/gtPlusPlus/core/material/ALLOY.java
#	src/Java/gtPlusPlus/core/material/ELEMENT.java
#	src/Java/gtPlusPlus/core/material/Material.java
#	src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java

6 files changed, 52 insertions, 51 deletions

diff --git a/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java
index 4b5bc96006..cd79cf7fe6 100644
--- a/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java
@@ -11,10 +11,10 @@ import java.util.Random;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import gtPlusPlus.api.analytics.SegmentAnalytics;
 import gtPlusPlus.api.analytics.SegmentHelper;
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.math.MathUtils;
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
@@ -107,7 +107,7 @@ public class BlockEventHandler {
 					}
 				}
 				else {
-					Utils.LOG_WARNING("invalid chance");
+					Logger.WARNING("invalid chance");
 				}
 			}
 
@@ -129,15 +129,15 @@ public class BlockEventHandler {
 						}
 					}
 
-					Utils.LOG_WARNING("Found Limestone in OreDict.");
+					Logger.WARNING("Found Limestone in OreDict.");
 					if (!mBlockTypes.isEmpty()) {
-						Utils.LOG_WARNING("1a | "+event.block.getUnlocalizedName());
+						Logger.WARNING("1a | "+event.block.getUnlocalizedName());
 						for (final Block temp : mBlockTypes){
-							Utils.LOG_WARNING("2a - "+temp.getUnlocalizedName());
+							Logger.WARNING("2a - "+temp.getUnlocalizedName());
 							if (event.block == temp) {
-								Utils.LOG_WARNING("3a - found "+temp.getUnlocalizedName());
+								Logger.WARNING("3a - found "+temp.getUnlocalizedName());
 								if (MathUtils.randInt(1, chanceToDropFluoriteOre) == 1){
-									Utils.LOG_WARNING("4a");
+									Logger.WARNING("4a");
 									event.drops.clear();
 									event.drops.add(fluoriteOre.copy());
 								}
@@ -148,9 +148,9 @@ public class BlockEventHandler {
 
 
 				if (event.block.getUnlocalizedName().toLowerCase().contains("limestone")){
-					Utils.LOG_WARNING("1c");
+					Logger.WARNING("1c");
 					if (MathUtils.randInt(1, chanceToDropFluoriteOre) == 1){
-						Utils.LOG_WARNING("2c");
+						Logger.WARNING("2c");
 						event.drops.clear();
 						event.drops.add(fluoriteOre.copy());
 					}
@@ -170,7 +170,7 @@ public class BlockEventHandler {
 			}
 		}
 		catch (Throwable r){
-			Utils.LOG_INFO("Block Event Handler Failed. Please Report this to Alkalus.");
+			Logger.INFO("Block Event Handler Failed. Please Report this to Alkalus.");
 			r.printStackTrace();
 		}
 	}
diff --git a/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java
index 7629c98eb4..09365e3caf 100644
--- a/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java
@@ -6,6 +6,7 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.PlayerEvent;
 import gtPlusPlus.api.analytics.SegmentAnalytics;
 import gtPlusPlus.api.analytics.SegmentHelper;
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.proxy.ClientProxy;
@@ -52,15 +53,15 @@ public class LoginEventHandler {
 
 					if (CORE.ConfigSwitches.enableUpdateChecker){
 						if (!Utils.isModUpToDate()){
-							Utils.LOG_INFO("[GT++] You're not using the latest recommended version of GT++, consider updating.");
+							Logger.INFO("[GT++] You're not using the latest recommended version of GT++, consider updating.");
 							if (!CORE.MASTER_VERSION.toLowerCase().equals("offline")) {
-								Utils.LOG_INFO("Latest version is: "+CORE.MASTER_VERSION);
+								Logger.INFO("Latest version is: "+CORE.MASTER_VERSION);
 							}
-							Utils.LOG_INFO("You currently have: "+CORE.VERSION);
+							Logger.INFO("You currently have: "+CORE.VERSION);
 							ShortTimer(this.localPlayerRef, 20);						
 						}
 						else {
-							Utils.LOG_INFO("You're using the latest recommended version of GT++.");
+							Logger.INFO("You're using the latest recommended version of GT++.");
 						}
 					}
 
@@ -109,7 +110,7 @@ public class LoginEventHandler {
 
 			}
 		} catch (final Throwable errr){
-			Utils.LOG_INFO("Login Handler encountered an error.");
+			Logger.INFO("Login Handler encountered an error.");
 
 		}
 	}
diff --git a/src/Java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java
index dff8d3049e..aa9155d654 100644
--- a/src/Java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java
@@ -5,7 +5,7 @@ import java.util.UUID;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.metatileentity.*;
-import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.util.player.PlayerUtils;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.machines.GregtechMetaSafeBlockBase;
 import net.minecraft.block.Block;
@@ -21,7 +21,7 @@ public class PickaxeBlockBreakEventHandler {
 			final TileEntity entity = event.world.getTileEntity(event.x, event.y, event.z);
 			if (entity != null){
 				final EntityPlayer playerInternal = event.getPlayer();
-				Utils.LOG_WARNING(entity.getClass().getSimpleName());
+				Logger.WARNING(entity.getClass().getSimpleName());
 				if (entity.getClass().getSimpleName().equals("")){
 
 				}
@@ -32,12 +32,12 @@ public class PickaxeBlockBreakEventHandler {
 
 						final UUID ownerUUID = ((GregtechMetaSafeBlockBase)X).ownerUUID;
 						final UUID accessorUUID = playerInternal.getUniqueID();
-						Utils.LOG_WARNING("Owner UUID: "+ownerUUID);
-						Utils.LOG_WARNING("Accessor UUID: "+accessorUUID);
+						Logger.WARNING("Owner UUID: "+ownerUUID);
+						Logger.WARNING("Accessor UUID: "+accessorUUID);
 
 						if (((GregtechMetaSafeBlockBase)X).bUnbreakable){
 
-							Utils.LOG_INFO("UUID info. Accessor: "+accessorUUID + " | Owner: "+ownerUUID);
+							Logger.INFO("UUID info. Accessor: "+accessorUUID + " | Owner: "+ownerUUID);
 
 							if (accessorUUID == ownerUUID){
 								PlayerUtils.messagePlayer(playerInternal, "Since you own this block, it has been destroyed.");
diff --git a/src/Java/gtPlusPlus/core/handler/events/SneakManager.java b/src/Java/gtPlusPlus/core/handler/events/SneakManager.java
index 02072fe32f..c504a46e82 100644
--- a/src/Java/gtPlusPlus/core/handler/events/SneakManager.java
+++ b/src/Java/gtPlusPlus/core/handler/events/SneakManager.java
@@ -1,6 +1,6 @@
 package gtPlusPlus.core.handler.events;
 
-import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.api.objects.Logger;
 import net.minecraft.client.Minecraft;
 
 public class SneakManager {
@@ -41,7 +41,7 @@ public class SneakManager {
 	}
 
 	private static State toggleState(final State state){
-		Utils.LOG_INFO("State Toggle");
+		Logger.INFO("State Toggle");
 		if (state == State.ON) {
 			return State.OFF;
 		}
diff --git a/src/Java/gtPlusPlus/core/handler/events/UnbreakableBlockManager.java b/src/Java/gtPlusPlus/core/handler/events/UnbreakableBlockManager.java
index ab11e483ed..39cd7d166d 100644
--- a/src/Java/gtPlusPlus/core/handler/events/UnbreakableBlockManager.java
+++ b/src/Java/gtPlusPlus/core/handler/events/UnbreakableBlockManager.java
@@ -2,7 +2,7 @@ package gtPlusPlus.core.handler.events;
 
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.metatileentity.*;
-import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GregtechMetaSafeBlock;
 import net.minecraft.block.Block;
 import net.minecraft.tileentity.TileEntity;
@@ -24,7 +24,7 @@ public class UnbreakableBlockManager{
 			this.makeIndestructible(/*aPlayer*/);
 		}
 		else {
-			Utils.LOG_WARNING("Why do you run twice?");
+			Logger.WARNING("Why do you run twice?");
 		}
 	}
 
@@ -37,18 +37,18 @@ public class UnbreakableBlockManager{
 	private void makeIndestructible(/*EntityPlayer aPlayer*/){
 
 
-		Utils.LOG_WARNING("Initializing the code to set this TE to -1 hardness and make it indestructible.");
+		Logger.WARNING("Initializing the code to set this TE to -1 hardness and make it indestructible.");
 		final int X = mTileEntity.xCoord; //(GregtechMetaSafeBlock) this.mTileEntity.getXCoord();
 		final int Y = mTileEntity.yCoord;
 		final int Z = mTileEntity.zCoord;
-		Utils.LOG_WARNING("Grabbing TileEntity @ [x,y,z] |"+X+"|"+Y+"|"+Z+"|");
+		Logger.WARNING("Grabbing TileEntity @ [x,y,z] |"+X+"|"+Y+"|"+Z+"|");
 
 		try{
 			final GregtechMetaSafeBlock MetaSafeBlock = ((GregtechMetaSafeBlock) UnbreakableBlockManager.mTileEntity.getMetaTileEntity());
 			final TileEntity BaseMetaTileEntity = mTileEntity.getTileEntity(X, Y, Z);
 			//MetaSafeBlockBase.
 			final World TE_WORLD = MetaSafeBlock.getBaseMetaTileEntity().getWorld();
-			Utils.LOG_WARNING("Checking new State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable);
+			Logger.WARNING("Checking new State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable);
 			final TileEntity entity = BaseMetaTileEntity;
 			innerInvincible(MetaSafeBlock, entity, TE_WORLD, /*aPlayer,*/ X, Y, Z);
 		}
@@ -61,26 +61,26 @@ public class UnbreakableBlockManager{
 
 	private static void innerInvincible(final GregtechMetaSafeBlock MetaSafeBlock, final TileEntity entity, final World TE_WORLD, /*EntityPlayer aPlayer,*/ final int X, final int Y, final int Z){
 		if (entity != null){
-			Utils.LOG_WARNING("Checking new State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable);
-			Utils.LOG_WARNING("Grabbed TE: "+entity.toString());
+			Logger.WARNING("Checking new State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable);
+			Logger.WARNING("Grabbed TE: "+entity.toString());
 
 
 
 
 			if ((entity instanceof BaseTileEntity) && !(entity instanceof BaseMetaPipeEntity)){
 				final IMetaTileEntity I = ((BaseMetaTileEntity)entity).getMetaTileEntity();
-				Utils.LOG_WARNING("Checking State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable);
-				Utils.LOG_WARNING("I Details: "+I.getMetaName()+" | "+I.getTileEntityBaseType()+" | "+I.toString());
+				Logger.WARNING("Checking State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable);
+				Logger.WARNING("I Details: "+I.getMetaName()+" | "+I.getTileEntityBaseType()+" | "+I.toString());
 
 
 
 
 
 				if (I instanceof GregtechMetaSafeBlock){
-					Utils.LOG_WARNING("Checking State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable);
+					Logger.WARNING("Checking State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable);
 
 					final Block ThisBlock = I.getBaseMetaTileEntity().getBlock(X, Y, Z);
-					Utils.LOG_WARNING("Block Details: "+ThisBlock.toString());
+					Logger.WARNING("Block Details: "+ThisBlock.toString());
 
 
 					if (((GregtechMetaSafeBlock)I).bUnbreakable){
@@ -88,11 +88,11 @@ public class UnbreakableBlockManager{
 						//ThisBlock.setResistance(18000000.0F);
 						ThisBlock.setResistance(-1);
 						ThisBlock.setBlockUnbreakable();
-						Utils.LOG_WARNING("Changing State of Flag. Old Value="+MetaSafeBlock.bUnbreakable+" Expected Value=true");
+						Logger.WARNING("Changing State of Flag. Old Value="+MetaSafeBlock.bUnbreakable+" Expected Value=true");
 						MetaSafeBlock.bUnbreakable = true;
 						//entity.markDirty();
-						Utils.LOG_WARNING("Checking new State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable);
-						Utils.LOG_ERROR("New Indestructible Flag enabled.");
+						Logger.WARNING("Checking new State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable);
+						Logger.ERROR("New Indestructible Flag enabled.");
 						//GT_Utility.sendChatToPlayer(aPlayer, "Block is now unbreakable.");
 					}
 
@@ -102,32 +102,32 @@ public class UnbreakableBlockManager{
 					else {
 						ThisBlock.setHardness(1);
 						ThisBlock.setResistance(1.0F);
-						Utils.LOG_WARNING("Changing State of Flag. Old Value="+MetaSafeBlock.bUnbreakable+" Expected Value=false");
+						Logger.WARNING("Changing State of Flag. Old Value="+MetaSafeBlock.bUnbreakable+" Expected Value=false");
 						MetaSafeBlock.bUnbreakable = false;
 						//entity.markDirty();
-						Utils.LOG_WARNING("Checking new State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable);
-						Utils.LOG_ERROR("New Indestructible Flag disabled.");
+						Logger.WARNING("Checking new State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable);
+						Logger.ERROR("New Indestructible Flag disabled.");
 						//GT_Utility.sendChatToPlayer(aPlayer, "Block is now breakable.");
 					}
 
 					//entity.markDirty();
 
-					Utils.LOG_WARNING("Block Hardness: "+ThisBlock.getBlockHardness(TE_WORLD, X, Y, Z));
-					Utils.LOG_WARNING("Checking State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable);
+					Logger.WARNING("Block Hardness: "+ThisBlock.getBlockHardness(TE_WORLD, X, Y, Z));
+					Logger.WARNING("Checking State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable);
 					hasRun = false;
 
 				}
 				else {
-					Utils.LOG_WARNING("I is not an instanceof MetaSafeBlockBase");
-					Utils.LOG_WARNING("Checking State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable);
+					Logger.WARNING("I is not an instanceof MetaSafeBlockBase");
+					Logger.WARNING("Checking State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable);
 				}
 			} else {
-				Utils.LOG_WARNING("TE is not an instanceof BaseTileEntity or may be a pipe.");
-				Utils.LOG_WARNING("Checking State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable);
+				Logger.WARNING("TE is not an instanceof BaseTileEntity or may be a pipe.");
+				Logger.WARNING("Checking State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable);
 			}
 		}else {
-			Utils.LOG_WARNING("Did not grab a TE instance to make a block instance from.");
-			Utils.LOG_WARNING("Checking State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable);
+			Logger.WARNING("Did not grab a TE instance to make a block instance from.");
+			Logger.WARNING("Checking State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable);
 		}
 	}
 
diff --git a/src/Java/gtPlusPlus/core/handler/events/ZombieBackupSpawnEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/ZombieBackupSpawnEventHandler.java
index d40ed64f4d..877b0c6ced 100644
--- a/src/Java/gtPlusPlus/core/handler/events/ZombieBackupSpawnEventHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/events/ZombieBackupSpawnEventHandler.java
@@ -8,7 +8,7 @@ import cpw.mods.fml.common.eventhandler.Event.Result;
 import cpw.mods.fml.common.eventhandler.EventPriority;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import gtPlusPlus.api.analytics.SegmentHelper;
-import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.api.objects.Logger;
 import net.minecraftforge.event.entity.living.ZombieEvent;
 
 public class ZombieBackupSpawnEventHandler {
@@ -32,7 +32,7 @@ public class ZombieBackupSpawnEventHandler {
 			if (event.attacker != null){
 				SegmentHelper.getInstance().trackUser(event.attacker.getUniqueID().toString(), "Zombie Backup");			
 			}
-			Utils.LOG_WARNING("[Zombie] ZombieEvent.SummonAidEvent.");
+			Logger.WARNING("[Zombie] ZombieEvent.SummonAidEvent.");
 			event.setResult(Result.DENY);
 		}
 		catch(Throwable t){}
@@ -41,9 +41,9 @@ public class ZombieBackupSpawnEventHandler {
 	@SubscribeEvent(priority = EventPriority.HIGHEST)
 	public void onZombieReinforcement(final ZombieEvent event) {
 		try {
-			Utils.LOG_WARNING("[Zombie] ZombieEvent.");
+			Logger.WARNING("[Zombie] ZombieEvent.");
 			if (event.entity != null){
-				Utils.LOG_WARNING("Event Entity: "+event.entity.getCommandSenderName());
+				Logger.WARNING("Event Entity: "+event.entity.getCommandSenderName());
 			}
 			event.setResult(Result.DENY);
 		}