+ Added a debug item for linking blocks.

% More project clean-up.
% Made fish trap 2x slower.
$ Fixed issue with fish trap name.
$ Fixed .08 issue getting powder barrels.

14 files changed, 285 insertions, 77 deletions

diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java b/src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java
index d258d1fe73..3ccc10d4c2 100644
--- a/src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java
+++ b/src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java
@@ -2,6 +2,8 @@ package gtPlusPlus.api.objects.minecraft;
 
 import java.io.Serializable;
 
+import gtPlusPlus.api.objects.data.AutoMap;
+
 public class BlockPos implements Serializable{
 
 	private static final long serialVersionUID = -7271947491316682006L;
@@ -82,4 +84,40 @@ public class BlockPos implements Serializable{
 		return distanceFrom(x, y, z) <= (range * range);
 	}
 
+	
+	public BlockPos getUp() {
+		return new BlockPos(this.xPos, this.yPos+1, this.zPos, this.dim);
+	}
+	
+	public BlockPos getDown() {
+		return new BlockPos(this.xPos, this.yPos-1, this.zPos, this.dim);
+	}	
+
+	public BlockPos getXPos() {
+		return new BlockPos(this.xPos+1, this.yPos, this.zPos, this.dim);
+	}
+	
+	public BlockPos getXNeg() {
+		return new BlockPos(this.xPos-1, this.yPos, this.zPos, this.dim);
+	}
+	
+	public BlockPos getZPos() {
+		return new BlockPos(this.xPos, this.yPos, this.zPos+1, this.dim);
+	}
+
+	public BlockPos getZNeg() {
+		return new BlockPos(this.xPos, this.yPos, this.zPos-1, this.dim);
+	}
+	
+	public AutoMap<BlockPos> getSurroundingBlocks(){
+		AutoMap<BlockPos> sides = new AutoMap<BlockPos>();
+		sides.put(getUp());
+		sides.put(getDown());
+		sides.put(getXPos());
+		sides.put(getXNeg());
+		sides.put(getZPos());
+		sides.put(getZNeg());		
+		return sides;
+	}
+	
 }
diff --git a/src/Java/gtPlusPlus/core/util/data/UUIDGenerator.java b/src/Java/gtPlusPlus/api/objects/random/UUIDGenerator.java
index 513468a9f6..fec92368f8 100644
--- a/src/Java/gtPlusPlus/core/util/data/UUIDGenerator.java
+++ b/src/Java/gtPlusPlus/api/objects/random/UUIDGenerator.java
@@ -1,12 +1,10 @@
-package gtPlusPlus.core.util.data;
+package gtPlusPlus.api.objects.random;
 
 import java.io.IOException;
 import java.net.InetAddress;
 import java.util.Random;
 import java.util.UUID;
 
-import gtPlusPlus.api.objects.random.CSPRNG_DO_NOT_USE;
-
 /**
  * 
  * Implement modified version of Apache's OpenJPA UUID generator.
diff --git a/src/Java/gtPlusPlus/core/handler/analytics/SegmentAnalytics.java b/src/Java/gtPlusPlus/core/handler/analytics/SegmentAnalytics.java
index 4d2d2d4a6e..28d3266407 100644
--- a/src/Java/gtPlusPlus/core/handler/analytics/SegmentAnalytics.java
+++ b/src/Java/gtPlusPlus/core/handler/analytics/SegmentAnalytics.java
@@ -12,10 +12,10 @@ import com.mojang.authlib.GameProfile;
 import com.segment.analytics.Analytics;
 
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.random.UUIDGenerator;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.data.UUIDGenerator;
 import gtPlusPlus.core.util.data.UUIDUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import ic2.core.IC2;
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index ce2c49bead..50ff8c061b 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -50,6 +50,7 @@ import gtPlusPlus.core.item.general.throwables.ItemHydrofluoricAcidPotion;
 import gtPlusPlus.core.item.general.throwables.ItemSulfuricAcidPotion;
 import gtPlusPlus.core.item.init.ItemsFoods;
 import gtPlusPlus.core.item.init.ItemsMultiTools;
+import gtPlusPlus.core.item.tool.misc.ConnectedBlockFinder;
 import gtPlusPlus.core.item.tool.misc.SandstoneHammer;
 import gtPlusPlus.core.item.tool.staballoy.MultiPickaxeBase;
 import gtPlusPlus.core.item.tool.staballoy.MultiSpadeBase;
@@ -699,6 +700,8 @@ public final class ModItems {
 
 		//Chemistry
 		CoalTar.run();
+		
+		new ConnectedBlockFinder();
 
 		//Misc Items
 		@SuppressWarnings("unused")
diff --git a/src/Java/gtPlusPlus/core/item/tool/misc/ConnectedBlockFinder.java b/src/Java/gtPlusPlus/core/item/tool/misc/ConnectedBlockFinder.java
new file mode 100644
index 0000000000..f0cc8c7344
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/tool/misc/ConnectedBlockFinder.java
@@ -0,0 +1,150 @@
+package gtPlusPlus.core.item.tool.misc;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.api.objects.minecraft.BlockPos;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.BaseItemWithDamageValue;
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.world.World;
+
+public class ConnectedBlockFinder extends BaseItemWithDamageValue{
+
+	public ConnectedBlockFinder() {
+		super("item.test.connector");
+		this.setTextureName("stick");
+		this.setMaxStackSize(1);
+		this.setMaxDamage(10000);
+		setCreativeTab(AddToCreativeTab.tabTools);
+		GameRegistry.registerItem(this, getUnlocalizedName());
+	}
+
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	@Override
+	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
+		list.add(EnumChatFormatting.GRAY+"Finds connected blocks, turns them to Glass once found.");
+		super.addInformation(stack, aPlayer, list, bool);
+	}
+
+	@Override
+	public boolean doesContainerItemLeaveCraftingGrid(final ItemStack itemStack){
+		return false;
+	}
+
+	@Override
+	public boolean getShareTag(){
+		return true;
+	}
+
+	@Override
+	public boolean hasContainerItem(final ItemStack itemStack){
+		return true;
+	}
+	@Override
+	public ItemStack getContainerItem(final ItemStack itemStack){
+		return itemStack;
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public EnumRarity getRarity(final ItemStack par1ItemStack){
+		return EnumRarity.uncommon;
+	}
+
+	@Override
+	public boolean hasEffect(final ItemStack par1ItemStack){
+		return false;
+	}
+
+
+	@Override
+	public boolean onItemUse(
+			ItemStack stack, EntityPlayer player, World world,
+			int x,	int y, int z, int side,
+			float hitX, float hitY, float hitZ) {
+
+		BlockPos mStartPoint = new BlockPos(x,y,z);
+
+		Block mBlockType = world.getBlock(x, y, z);
+		int mBlockMeta = mBlockType.getDamageValue(world, x, y, z);
+
+		Set<BlockPos> mTotalIndex = new HashSet<BlockPos>();
+		Set<BlockPos> mFirstSearch = new HashSet<BlockPos>();
+		Set<BlockPos> mSearch_A = new HashSet<BlockPos>();
+		Set<BlockPos> mSearch_B = new HashSet<BlockPos>();
+		Set<BlockPos> mSearch_C = new HashSet<BlockPos>();
+
+		for (BlockPos b : mStartPoint.getSurroundingBlocks().values()) {
+			if (world.getBlock(b.xPos, b.yPos, b.zPos) == mBlockType) {
+				if (mBlockType.getDamageValue(world, b.xPos, b.yPos, b.zPos) == mBlockMeta) {
+					if (mFirstSearch.add(b)) {
+						if (mTotalIndex.add(b)) {
+							world.setBlock(b.xPos, b.yPos, b.zPos, Blocks.emerald_ore);		
+						}
+					}
+				}
+			}
+		}
+
+		for (BlockPos b : mFirstSearch) {
+			if (world.getBlock(b.xPos, b.yPos, b.zPos) == mBlockType) {
+				if (mBlockType.getDamageValue(world, b.xPos, b.yPos, b.zPos) == mBlockMeta) {
+					if (mSearch_A.add(b)) {
+						if (mTotalIndex.add(b)) {
+							world.setBlock(b.xPos, b.yPos, b.zPos, Blocks.emerald_ore);		
+						}
+					}
+				}
+			}
+		}
+
+		for (BlockPos b : mSearch_A) {
+			if (world.getBlock(b.xPos, b.yPos, b.zPos) == mBlockType) {
+				if (mBlockType.getDamageValue(world, b.xPos, b.yPos, b.zPos) == mBlockMeta) {
+					if (mSearch_B.add(b)) {
+						if (mTotalIndex.add(b)) {
+							world.setBlock(b.xPos, b.yPos, b.zPos, Blocks.emerald_ore);		
+						}
+					}
+				}
+			}
+		}
+		
+		for (BlockPos b : mSearch_B) {
+			if (world.getBlock(b.xPos, b.yPos, b.zPos) == mBlockType) {
+				if (mBlockType.getDamageValue(world, b.xPos, b.yPos, b.zPos) == mBlockMeta) {
+					if (mSearch_C.add(b)) {
+						if (mTotalIndex.add(b)) {
+							world.setBlock(b.xPos, b.yPos, b.zPos, Blocks.emerald_ore);		
+						}
+					}
+				}
+			}
+		}
+
+		return super.onItemUse(stack, player, world, x, y, z, side, hitX, hitY, hitZ);
+	}	
+
+	@Override
+	public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) {
+		// TODO Auto-generated method stub
+		return super.onItemRightClick(p_77659_1_, p_77659_2_, p_77659_3_);
+	}
+
+
+
+
+
+
+
+}
diff --git a/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java b/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java
index 5ad027409b..138015b7cd 100644
--- a/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java
+++ b/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java
@@ -6,7 +6,7 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.minecraft.UtilsMining;
+import gtPlusPlus.core.util.minecraft.MiningUtils;
 import net.minecraft.block.Block;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
@@ -101,7 +101,7 @@ public class StaballoyPickaxe extends ItemPickaxe{
 		if (!currentWorld.isRemote){
 			try {
 				correctTool = currentBlock.getHarvestTool(0);
-				if (UtilsMining.getBlockType(currentBlock, currentWorld, xyz, this.miningLevel) || correctTool.equals("pickaxe") || correctTool.equals("null")){
+				if (MiningUtils.getBlockType(currentBlock, currentWorld, xyz, this.miningLevel) || correctTool.equals("pickaxe") || correctTool.equals("null")){
 					//Utils.LOG_WARNING(correctTool);
 					return true;}
 			} catch (final NullPointerException e){
diff --git a/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java b/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java
index 50a2a48588..067a2ea9bd 100644
--- a/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java
+++ b/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java
@@ -6,7 +6,7 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.minecraft.UtilsMining;
+import gtPlusPlus.core.util.minecraft.MiningUtils;
 import net.minecraft.block.Block;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
@@ -76,7 +76,7 @@ public class StaballoySpade extends ItemSpade{
 				//Utils.LOG_WARNING(correctTool);
 
 				Logger.WARNING("Tool for Block: "+correctTool+" | Current block: "+currentBlock.getLocalizedName());
-				if (UtilsMining.getBlockType(currentBlock, currentWorld, xyz, this.miningLevel) || correctTool.equals("shovel")){
+				if (MiningUtils.getBlockType(currentBlock, currentWorld, xyz, this.miningLevel) || correctTool.equals("shovel")){
 					return true;}
 			} catch (final NullPointerException e){
 				return false;}
diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java
index 250a332f2b..4c7e6e3652 100644
--- a/src/Java/gtPlusPlus/core/recipe/common/CI.java
+++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java
@@ -20,7 +20,7 @@ public class CI {
 
 	//null
 	public static ItemStack _NULL = ItemUtils.getSimpleStack(ModItems.AAA_Broken);
-	
+
 	//bits
 	public static long bits = GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE
 			| GT_ModHandler.RecipeBits.BUFFERED;
@@ -154,7 +154,7 @@ public class CI {
 	public static String[] component_Plate;
 	public static String[] component_Rod;
 	public static String[] component_Ingot;
-	
+
 	//Crafting Tools
 	public static String craftingToolWrench = "craftingToolWrench";
 	public static String craftingToolHammer_Hard = "craftingToolHardHammer";
@@ -165,7 +165,7 @@ public class CI {
 	public static String craftingToolCrowbar = "craftingToolCrowbar";
 	public static String craftingToolWireCutter = "craftingToolWirecutter";
 	public static String craftingToolSolderingIron = "craftingToolSolderingIron";
-	
+
 	//Explosives
 	public static ItemStack explosivePowderKeg;
 	public static ItemStack explosiveTNT;
@@ -228,7 +228,7 @@ public class CI {
 		circuitTier7 = getTieredCircuit(7);
 		circuitTier8 = getTieredCircuit(8);
 		circuitTier9 = getTieredCircuit(9);
-		
+
 	}	
 
 	public static Object getTieredCircuit(int tier){
@@ -272,11 +272,11 @@ public class CI {
 		}
 		return _NULL;
 	}
-	
+
 	public static ItemStack[] getAllCircuitsOfTier(int tier){		
 		return ItemUtils.getStackOfAllOreDictGroup(getTieredCircuitOreDictName(tier));
 	}
-	
+
 	public static String getTieredCircuitOreDictName(int tier){
 		if (tier == 0){
 			return "circuitPrimitive";
@@ -389,7 +389,7 @@ public class CI {
 			return ItemList.Tool_DataOrb.get(1);				
 		}
 	}
-	
+
 	public static final ItemStack getTieredMachineHull(int tier){
 		if (tier == 0){
 			return machineHull_ULV;
@@ -422,7 +422,7 @@ public class CI {
 			return machineHull_MAX;			
 		}
 	}
-	
+
 	public static final ItemStack getTieredMachineCasing(int tier){
 		if (tier == 0){
 			return machineCasing_ULV;
@@ -455,50 +455,51 @@ public class CI {
 			return machineCasing_MAX;			
 		}
 	}
-	
+
 	public static void init() {		
 		//Set Explosives
-		if (ItemList.valueOf("Block_Powderbarrel") != null){
-			explosivePowderKeg = ItemList.valueOf("Block_Powderbarrel").get(1);
-		}
-		else {
-			explosivePowderKeg = ItemUtils.getSimpleStack(Items.gunpowder);
+		try {
+			if (ItemList.valueOf("Block_Powderbarrel") != null){
+				explosivePowderKeg = ItemList.valueOf("Block_Powderbarrel").get(1).copy();
+			}
+		} catch (java.lang.IllegalArgumentException Y) {
+			explosivePowderKeg = ItemUtils.getSimpleStack(Items.gunpowder).copy();
 		}
-		explosiveTNT = ItemUtils.getSimpleStack(Blocks.tnt);
+		explosiveTNT = ItemUtils.getSimpleStack(Blocks.tnt).copy();
 		explosiveITNT = Ic2Items.industrialTnt.copy();
-		
+
 		//Machine Casings
-				machineCasing_ULV = ItemList.Casing_ULV.get(1);
-				machineCasing_LV = ItemList.Casing_LV.get(1);
-				machineCasing_MV = ItemList.Casing_MV.get(1);
-				machineCasing_HV = ItemList.Casing_HV.get(1);
-				machineCasing_EV = ItemList.Casing_EV.get(1);
-				machineCasing_IV = ItemList.Casing_IV.get(1);
-				machineCasing_LuV = ItemList.Casing_LuV.get(1);
-				machineCasing_ZPM = ItemList.Casing_ZPM.get(1);
-				machineCasing_UV = ItemList.Casing_UV.get(1);
-				machineCasing_MAX = ItemList.Casing_MAX.get(1);
+		machineCasing_ULV = ItemList.Casing_ULV.get(1);
+		machineCasing_LV = ItemList.Casing_LV.get(1);
+		machineCasing_MV = ItemList.Casing_MV.get(1);
+		machineCasing_HV = ItemList.Casing_HV.get(1);
+		machineCasing_EV = ItemList.Casing_EV.get(1);
+		machineCasing_IV = ItemList.Casing_IV.get(1);
+		machineCasing_LuV = ItemList.Casing_LuV.get(1);
+		machineCasing_ZPM = ItemList.Casing_ZPM.get(1);
+		machineCasing_UV = ItemList.Casing_UV.get(1);
+		machineCasing_MAX = ItemList.Casing_MAX.get(1);
 
-				//Machine Hulls
-				machineHull_ULV = ItemList.Hull_ULV.get(1);
-				machineHull_LV = ItemList.Hull_LV.get(1);
-				machineHull_MV = ItemList.Hull_MV.get(1);
-				machineHull_HV = ItemList.Hull_HV.get(1);
-				machineHull_EV = ItemList.Hull_EV.get(1);
-				machineHull_IV = ItemList.Hull_IV.get(1);
-				machineHull_LuV = ItemList.Hull_LuV.get(1);
-				machineHull_ZPM = ItemList.Hull_ZPM.get(1);
-				machineHull_UV = ItemList.Hull_UV.get(1);
-				machineHull_MAX = ItemList.Hull_MAX.get(1);
+		//Machine Hulls
+		machineHull_ULV = ItemList.Hull_ULV.get(1);
+		machineHull_LV = ItemList.Hull_LV.get(1);
+		machineHull_MV = ItemList.Hull_MV.get(1);
+		machineHull_HV = ItemList.Hull_HV.get(1);
+		machineHull_EV = ItemList.Hull_EV.get(1);
+		machineHull_IV = ItemList.Hull_IV.get(1);
+		machineHull_LuV = ItemList.Hull_LuV.get(1);
+		machineHull_ZPM = ItemList.Hull_ZPM.get(1);
+		machineHull_UV = ItemList.Hull_UV.get(1);
+		machineHull_MAX = ItemList.Hull_MAX.get(1);
 
-				//Gear box Casings
-				gearboxCasing_Tier_1 = ItemList.Casing_Gearbox_Bronze.get(1);
-				gearboxCasing_Tier_2 = ItemList.Casing_Gearbox_Steel.get(1);
-				gearboxCasing_Tier_3 = ItemList.Casing_Gearbox_Titanium.get(1);
-				gearboxCasing_Tier_4 = ItemList.Casing_Gearbox_TungstenSteel.get(1);
+		//Gear box Casings
+		gearboxCasing_Tier_1 = ItemList.Casing_Gearbox_Bronze.get(1);
+		gearboxCasing_Tier_2 = ItemList.Casing_Gearbox_Steel.get(1);
+		gearboxCasing_Tier_3 = ItemList.Casing_Gearbox_Titanium.get(1);
+		gearboxCasing_Tier_4 = ItemList.Casing_Gearbox_TungstenSteel.get(1);
 
-				//Machine Components
-				LOADER_Machine_Components.initialise();
+		//Machine Components
+		LOADER_Machine_Components.initialise();
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java
index 3c4a328599..2461eb16a5 100644
--- a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java
+++ b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java
@@ -243,13 +243,13 @@ public class TileEntityFishTrap extends TileEntity implements ISidedInventory {
 			calculateTickrate = 0;
 		}
 		else if ((this.waterSides > 2) && (this.waterSides < 4)) {
-			calculateTickrate = 3600;
+			calculateTickrate = 4800;
 		}
 		else if ((this.waterSides >= 4) && (this.waterSides < 6)) {
-			calculateTickrate = 2400;
+			calculateTickrate = 3600;
 		}
 		else if (this.waterSides == 6) {
-			calculateTickrate = 1200;
+			calculateTickrate = 2400;
 		}
 		this.baseTickRate = calculateTickrate;
 	}
@@ -387,7 +387,7 @@ public class TileEntityFishTrap extends TileEntity implements ISidedInventory {
 
 	@Override
 	public String getInventoryName() {
-		return this.hasCustomInventoryName() ? this.customName : "container.fishrap";
+		return this.hasCustomInventoryName() ? this.customName : "container.fishtrap";
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/core/util/UtilsText.java b/src/Java/gtPlusPlus/core/util/UtilsText.java
deleted file mode 100644
index 9896f2be0c..0000000000
--- a/src/Java/gtPlusPlus/core/util/UtilsText.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package gtPlusPlus.core.util;
-
-public enum UtilsText {
-
-	blue('1'), green('2'), teal('3'), maroon('4'), purple('5'), orange('6'), lightGray('7'), darkGray('8'), lightBlue(
-			'9'), black('0'), lime('a'), aqua('b'), red('c'), pink('d'), yellow('e'), white('f');
-
-	private char colourValue;
-
-	private UtilsText(final char value) {
-		this.colourValue = value;
-	}
-
-	public String colour() {
-		return "§" + this.colourValue;
-	}
-
-}
diff --git a/src/Java/gtPlusPlus/core/util/data/EnumUtils.java b/src/Java/gtPlusPlus/core/util/data/EnumUtils.java
index 22ca73be0b..4a29001a28 100644
--- a/src/Java/gtPlusPlus/core/util/data/EnumUtils.java
+++ b/src/Java/gtPlusPlus/core/util/data/EnumUtils.java
@@ -3,6 +3,8 @@ package gtPlusPlus.core.util.data;
 import com.google.common.base.Enums;
 import com.google.common.base.Optional;
 
+import gregtech.api.enums.Materials;
+
 public class EnumUtils {
 
 	/** 
@@ -36,6 +38,13 @@ public class EnumUtils {
 	        name, enumeration.getName()
 	    ));
 	}
+
+	public static Object getValue(Class class1, String materialName, boolean bool) {
+		if (Enum.class.isInstance(class1)){
+			return getValue(class1, materialName);
+		}
+		return null;		
+	}
 	
 	
 }
diff --git a/src/Java/gtPlusPlus/core/util/data/StringUtils.java b/src/Java/gtPlusPlus/core/util/data/StringUtils.java
index 77b1fc8413..3ad5f3bb8b 100644
--- a/src/Java/gtPlusPlus/core/util/data/StringUtils.java
+++ b/src/Java/gtPlusPlus/core/util/data/StringUtils.java
@@ -94,4 +94,20 @@ public class StringUtils {
 		return false;
 	}
 
+	//Can call this Enum for formatting.
+	public static enum TextUtils {
+		blue('1'), green('2'), teal('3'), maroon('4'), purple('5'), orange('6'), lightGray('7'), darkGray('8'), lightBlue(
+				'9'), black('0'), lime('a'), aqua('b'), red('c'), pink('d'), yellow('e'), white('f');
+
+		private char colourValue;
+		private TextUtils(final char value) {
+			this.colourValue = value;
+		}
+		public String colour() {
+			return getFormatter() + this.colourValue;
+		}
+		private String getFormatter() {		
+			return "\u00A7"; // Returns §.
+		}
+	}	
 }
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
index 0af72661e9..6c15c06b1d 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
@@ -10,6 +10,7 @@ import org.apache.commons.lang3.reflect.FieldUtils;
 
 import gregtech.api.enums.*;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.Utils;
@@ -173,9 +174,19 @@ public class MaterialUtils {
 		}
 	}
 
-	static Class<Materials> materialsEnum = Materials.class;
 	public static Materials getMaterialByName(String materialName) {
-		return EnumUtils.getValue(materialsEnum, materialName);
+		
+		if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
+			return (Materials) EnumUtils.getValue(gregtech.api.enums.Materials.class, materialName, false);			
+		}
+		else {
+			for (Materials m : Materials.values()) {
+				if (MaterialUtils.getMaterialName(m).toLowerCase().equals(materialName.toLowerCase())) {
+					return m;
+				}
+			}
+			return null;
+		}
 	}
 	
 	@SuppressWarnings("deprecation")
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/UtilsMining.java b/src/Java/gtPlusPlus/core/util/minecraft/MiningUtils.java
index eb6044fcd7..d44bf69253 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/UtilsMining.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/MiningUtils.java
@@ -6,7 +6,7 @@ import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
-public class UtilsMining {
+public class MiningUtils {
 
 	private static boolean durabilityDamage = false;
 	private static ItemStack stack;