^ Version Bump.

$ Reverted Utils.java (Fixes ArrayList<ArrayList> cannot be converted to List<Object>)
$ Fixed use of generics in MultiPickaxeBase.java.

4 files changed, 195 insertions, 193 deletions

diff --git a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java
index 6499dc696b..da152bb8d8 100644
--- a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java
+++ b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java
@@ -257,10 +257,10 @@ public class MultiPickaxeBase extends StaballoyPickaxe{
 		final Pair<?, ?> Y = this.enchantment;
 		if (Y != null){
 			if (Y.getKey() != null){
-				enchant = (Enchantment) ((Pair<?, ?>) this.enchantment).getKey();
+				enchant = (Enchantment) this.enchantment.getKey();
 			}
 			if (Y.getValue() != null){
-				enchantmentLevel = (byte) ((Pair<?, ?>) this.enchantment).getValue();
+				enchantmentLevel = ((Integer) this.enchantment.getValue()).intValue();
 			}
 		}
 		final ItemStack itemToEnchant = mThisItem;
@@ -277,10 +277,10 @@ public class MultiPickaxeBase extends StaballoyPickaxe{
 		final Pair<?, ?> Y = this.enchantment;
 		if (Y != null){
 			if (Y.getKey() != null){
-				enchant = (Enchantment) ((Pair<?, ?>) this.enchantment).getKey();
+				enchant = (Enchantment) this.enchantment.getKey();
 			}
 			if (Y.getValue() != null){
-				enchantmentLevel = (byte) ((Pair<?, ?>) this.enchantment).getValue();
+				enchantmentLevel = ((Integer) this.enchantment.getValue()).intValue();
 			}
 		}
 
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index 6faf131acb..d69cfbc371 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -26,7 +26,7 @@ public class CORE {
 
 	public static final String name = "GT++";
 	public static final String MODID = "miscutils";
-	public static final String VERSION = "1.4.9.70-alpha";
+	public static final String VERSION = "1.4.9.85-Beta";
 	public static final String MASTER_VERSION = NetworkUtils.getContentFromURL("https://raw.githubusercontent.com/draknyte1/GTplusplus/master/Recommended.txt").toLowerCase();
 	public static boolean isModUpToDate = Utils.isModUpToDate();
 	public static boolean DEBUG = false;
diff --git a/src/Java/gtPlusPlus/core/util/Utils.java b/src/Java/gtPlusPlus/core/util/Utils.java
index 72441660d2..db8ed87231 100644
--- a/src/Java/gtPlusPlus/core/util/Utils.java
+++ b/src/Java/gtPlusPlus/core/util/Utils.java
@@ -1,16 +1,6 @@
 package gtPlusPlus.core.util;
 
-import java.awt.Color;
-import java.awt.Graphics;
-import java.lang.reflect.Method;
-import java.util.*;
-
-import org.apache.commons.lang3.EnumUtils;
-
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.FMLLog;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.TC_Aspects;
+import gregtech.api.enums.*;
 import gregtech.api.enums.TC_Aspects.TC_AspectStack;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.core.lib.CORE;
@@ -22,7 +12,14 @@ import gtPlusPlus.core.util.math.MathUtils;
 import ic2.core.Ic2Items;
 import ic2.core.init.InternalName;
 import ic2.core.item.resources.ItemCell;
+
+import java.awt.Color;
+import java.awt.Graphics;
+import java.lang.reflect.Method;
+import java.util.*;
+
 import net.minecraft.block.Block;
+import net.minecraft.block.Block.SoundType;
 import net.minecraft.entity.Entity;
 import net.minecraft.item.Item.ToolMaterial;
 import net.minecraft.item.ItemStack;
@@ -34,6 +31,11 @@ import net.minecraftforge.common.util.EnumHelper;
 import net.minecraftforge.fluids.*;
 import net.minecraftforge.oredict.OreDictionary;
 
+import org.apache.commons.lang3.EnumUtils;
+
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.FMLLog;
+
 public class Utils {
 
 	public static final int WILDCARD_VALUE = Short.MAX_VALUE;
@@ -53,27 +55,27 @@ public class Utils {
 
 		if (CORE.MASTER_VERSION.toLowerCase().equals("offline")){
 			return false;
-		}
+		}	
 
 		if (CORE.MASTER_VERSION.equals(CORE.VERSION.toLowerCase())){
 			return true;
-		}
+		}		
 		return false;
 	}
 
-	public static TC_AspectStack getTcAspectStack (final TC_Aspects aspect, final long size){
+	public static TC_AspectStack getTcAspectStack (TC_Aspects aspect, long size){
 		return getTcAspectStack(aspect.name(), (int) size);
 	}
 
-	public static TC_AspectStack getTcAspectStack (final String aspect, final long size){
+	public static TC_AspectStack getTcAspectStack (String aspect, long size){
 		return getTcAspectStack(aspect, (int) size);
 	}
 
-	public static TC_AspectStack getTcAspectStack (final TC_Aspects aspect, final int size){
+	public static TC_AspectStack getTcAspectStack (TC_Aspects aspect, int size){
 		return getTcAspectStack(aspect.name(), size);
 	}
 
-	public static TC_AspectStack getTcAspectStack (final String aspect, final int size){
+	public static TC_AspectStack getTcAspectStack (String aspect, int size){
 
 		TC_AspectStack returnValue = null;
 
@@ -87,13 +89,13 @@ public class Utils {
 				else {
 					Utils.LOG_INFO("Fallback TC Aspect found - "+aspect+" - PLEASE UPDATE GREGTECH TO A NEWER VERSION TO REMOVE THIS MESSAGE - THIS IS NOT AN ERROR");
 					returnValue = new TC_AspectStack(TC_Aspects.valueOf("COGNITO"), size);
-				}
-			} catch (final NoSuchFieldError r){
+				}				
+			} catch (NoSuchFieldError r){
 				Utils.LOG_INFO("Invalid Thaumcraft Aspects - Report this issue to Alkalus");
 			}
 		}
 		else if (aspect.toUpperCase().equals("EXANIMUS")){
-			//Adds in Compat for older GT Versions which Misspell aspects.
+			//Adds in Compat for older GT Versions which Misspell aspects.			
 			try {
 				if (EnumUtils.isValidEnum(TC_Aspects.class, "EXANIMUS")){
 					Utils.LOG_WARNING("TC Aspect found - "+aspect);
@@ -102,15 +104,15 @@ public class Utils {
 				else {
 					Utils.LOG_INFO("Fallback TC Aspect found - "+aspect+" - PLEASE UPDATE GREGTECH TO A NEWER VERSION TO REMOVE THIS MESSAGE - THIS IS NOT AN ERROR");
 					returnValue = new TC_AspectStack(TC_Aspects.valueOf("EXAMINIS"), size);
-				}
-			} catch (final NoSuchFieldError r){
+				}				
+			} catch (NoSuchFieldError r){
 				Utils.LOG_INFO("Invalid Thaumcraft Aspects - Report this issue to Alkalus");
 			}
 
 
 		}
 		else if (aspect.toUpperCase().equals("PRAECANTATIO")){
-			//Adds in Compat for older GT Versions which Misspell aspects.
+			//Adds in Compat for older GT Versions which Misspell aspects.			
 			try {
 				if (EnumUtils.isValidEnum(TC_Aspects.class, "PRAECANTATIO")){
 					Utils.LOG_WARNING("TC Aspect found - "+aspect);
@@ -119,10 +121,10 @@ public class Utils {
 				else {
 					Utils.LOG_INFO("Fallback TC Aspect found - "+aspect+" - PLEASE UPDATE GREGTECH TO A NEWER VERSION TO REMOVE THIS MESSAGE - THIS IS NOT AN ERROR");
 					returnValue = new TC_AspectStack(TC_Aspects.valueOf("PRAECANTIO"), size);
-				}
-			} catch (final NoSuchFieldError r){
+				}				
+			} catch (NoSuchFieldError r){
 				Utils.LOG_INFO("Invalid Thaumcraft Aspects - Report this issue to Alkalus");
-			}
+			}			
 		}
 		else {
 			Utils.LOG_WARNING("TC Aspect found - "+aspect);
@@ -132,11 +134,11 @@ public class Utils {
 		return returnValue;
 	}
 
-	public static boolean containsMatch(final boolean strict, final ItemStack[] inputs, final ItemStack... targets)
+	public static boolean containsMatch(boolean strict, ItemStack[] inputs, ItemStack... targets)
 	{
-		for (final ItemStack input : inputs)
+		for (ItemStack input : inputs)
 		{
-			for (final ItemStack target : targets)
+			for (ItemStack target : targets)
 			{
 				if (itemMatches(target, input, strict))
 				{
@@ -147,67 +149,67 @@ public class Utils {
 		return false;
 	}
 
-	public static boolean itemMatches(final ItemStack target, final ItemStack input, final boolean strict)
+	public static boolean itemMatches(ItemStack target, ItemStack input, boolean strict)
 	{
-		if ((input == null) || (target == null))
+		if (input == null || target == null)
 		{
 			return false;
 		}
-		return ((target.getItem() == input.getItem()) && (((target.getItemDamage() == WILDCARD_VALUE) && !strict) || (target.getItemDamage() == input.getItemDamage())));
+		return (target.getItem() == input.getItem() && ((target.getItemDamage() == WILDCARD_VALUE && !strict) || target.getItemDamage() == input.getItemDamage()));
 	}
 
-	//Non-Dev Comments
-	public static void LOG_INFO(final String s){
+	//Non-Dev Comments 
+	public static void LOG_INFO(String s){
 		//if (CORE.DEBUG){
 		FMLLog.info("GT++: "+s);
 		//}
 	}
 
-	//Non-Dev Comments
-	public static void LOG_MACHINE_INFO(final String s){
+	//Non-Dev Comments 
+	public static void LOG_MACHINE_INFO(String s){
 		if (CORE.configSwitches.MACHINE_INFO || ClientProxy.playerName.toLowerCase().contains("draknyte1")){
-			FMLLog.info("GT++: Machine Info: "+s);
+		FMLLog.info("GT++: Machine Info: "+s);
 		}
 	}
 
 	//Developer Comments
-	public static void LOG_WARNING(final String s){
+	public static void LOG_WARNING(String s){
 		if (CORE.DEBUG){
 			FMLLog.warning("GT++: "+s);
 		}
 	}
 
 	//Errors
-	public static void LOG_ERROR(final String s){
+	public static void LOG_ERROR(String s){
 		if (CORE.DEBUG){
 			FMLLog.severe("GT++: "+s);
 		}
 	}
 
 	//Developer Logger
-	public static void LOG_SPECIFIC_WARNING(final String whatToLog, final String msg, final int line){
-		//if (!CORE.DEBUG){
+	public static void LOG_SPECIFIC_WARNING(String whatToLog, String msg, int line){
+		//if (!CORE.DEBUG){		
 		FMLLog.warning("GT++ |"+line+"| "+whatToLog+" | "+msg);
-		//}
+		//}			
 	}
 
-	public static void paintBox(final Graphics g, final int MinA, final int MinB, final int MaxA, final int MaxB){
-		g.drawRect (MinA, MinB, MaxA, MaxB);
+	public static void paintBox(Graphics g, int MinA, int MinB, int MaxA, int MaxB){
+		g.drawRect (MinA, MinB, MaxA, MaxB);  
 	}
 
 	// Send a message to all players on the server
-	public static void sendServerMessage(final String translationKey) {
+	public static void sendServerMessage(String translationKey) {
 		sendServerMessage(new ChatComponentText(translationKey));
 	}
 	// Send a message to all players on the server
-	public static void sendServerMessage(final IChatComponent chatComponent) {
+	public static void sendServerMessage(IChatComponent chatComponent) {
 		MinecraftServer.getServer().getConfigurationManager().sendChatMsg(chatComponent);
 	}
 
 	/**
 	 * Returns if that Liquid is IC2Steam.
 	 */
-	public static boolean isIC2Steam(final FluidStack aFluid) {
+	public static boolean isIC2Steam(FluidStack aFluid) {
 		if (aFluid == null) {
 			return false;
 		}
@@ -217,7 +219,7 @@ public class Utils {
 	/**
 	 * Returns a Liquid Stack with given amount of IC2Steam.
 	 */
-	public static FluidStack getIC2Steam(final long aAmount) {
+	public static FluidStack getIC2Steam(long aAmount) {
 		return FluidRegistry.getFluidStack("ic2steam", (int)aAmount);
 	}
 
@@ -229,17 +231,17 @@ public class Utils {
 			'A',slot_1,'B',slot_2,'C',slot_3,
 			'D',slot_4,'E',slot_5,'F',slot_6,
 			'G',slot_7,'H',slot_8,'I',slot_9
-		});
+		});			
 	}*/
 
-	public static String checkCorrectMiningToolForBlock(final Block currentBlock, final World currentWorld){
+	public static String checkCorrectMiningToolForBlock(Block currentBlock, World currentWorld){
 		String correctTool = "";
-		if (!currentWorld.isRemote){
+		if (!currentWorld.isRemote){			
 			try {
 				correctTool = currentBlock.getHarvestTool(0);
 				Utils.LOG_WARNING(correctTool);
 
-			} catch (final NullPointerException e){
+			} catch (NullPointerException e){
 
 			}
 		}
@@ -248,17 +250,17 @@ public class Utils {
 	}
 
 	/**
-	 *
+	 * 
 	 * @param colourStr e.g. "#FFFFFF"
 	 * @return String - formatted "rgb(0,0,0)"
 	 */
-	public static String hex2RgbFormatted(final String hexString) {
-		final Color c = new Color(
-				Integer.valueOf(hexString.substring(1, 3), 16),
-				Integer.valueOf(hexString.substring(3, 5), 16),
+	public static String hex2RgbFormatted(String hexString) {
+		Color c = new Color(
+				Integer.valueOf(hexString.substring(1, 3), 16), 
+				Integer.valueOf(hexString.substring(3, 5), 16), 
 				Integer.valueOf(hexString.substring(5, 7), 16));
 
-		final StringBuffer sb = new StringBuffer();
+		StringBuffer sb = new StringBuffer();
 		sb.append("rgb(");
 		sb.append(c.getRed());
 		sb.append(",");
@@ -270,11 +272,11 @@ public class Utils {
 	}
 
 	/**
-	 *
+	 * 
 	 * @param colourStr e.g. "#FFFFFF"
-	 * @return
+	 * @return 
 	 */
-	public static Color hex2Rgb(final String colorStr) {
+	public static Color hex2Rgb(String colorStr) {
 		return new Color(
 				Integer.valueOf( colorStr.substring( 1, 3 ), 16 ),
 				Integer.valueOf( colorStr.substring( 3, 5 ), 16 ),
@@ -282,72 +284,72 @@ public class Utils {
 	}
 
 	/**
-	 *
+	 * 
 	 * @param colourInt e.g. 0XFFFFFF
 	 * @return Colour
 	 */
-	public static Color hex2Rgb(final int colourInt) {
+	public static Color hex2Rgb(int colourInt) {		
 		return Color.decode(String.valueOf(colourInt));
 	}
 
 	/**
-	 *
+	 * 
 	 * @param colourInt e.g. 0XFFFFFF
 	 * @return short[]
 	 */
-	public static short[] hex2RgbShort(final int colourInt) {
-		final Color rgb = Color.decode(String.valueOf(colourInt));
-		final short[] rgba = {(short) rgb.getRed(), (short) rgb.getGreen(), (short) rgb.getBlue(), (short) rgb.getAlpha()};
+	public static short[] hex2RgbShort(int colourInt) {
+		Color rgb = Color.decode(String.valueOf(colourInt));
+		short[] rgba = {(short) rgb.getRed(), (short) rgb.getGreen(), (short) rgb.getBlue(), (short) rgb.getAlpha()};
 		return rgba;
 	}
 
-	public static Timer ShortTimer(final int seconds) {
+	public static Timer ShortTimer(int seconds) {
 		Timer timer;
 		timer = new Timer();
 		timer.schedule(new ShortTimerTask(), seconds * 1000);
 		return timer;
 	}
 
-	public static String byteToHex(final byte b) {
-		final int i = b & 0xFF;
+	public static String byteToHex(byte b) {
+		int i = b & 0xFF;
 		return Integer.toHexString(i);
 	}
 
-	public static Object[] convertListToArray(final List<Object> sourceList) {
-		final Object[] targetArray = sourceList.toArray(new Object[sourceList.size()]);
+	public static Object[] convertListToArray(List<Object> sourceList) {	
+		Object[] targetArray = sourceList.toArray(new Object[sourceList.size()]);
 		return targetArray;
 	}
 
-	public static List<Object> convertArrayToFixedSizeList(final Object[] sourceArray) {
-		final List<Object> targetList = Arrays.asList(sourceArray);
+	public static List<Object> convertArrayToFixedSizeList(Object[] sourceArray) {
+		List<Object> targetList = Arrays.asList(sourceArray);
 		return targetList;
 	}
 
-	public static List<Object> convertArrayToList(final Object[] sourceArray) {
-		final List<Object> targetList = new ArrayList<>(Arrays.asList(sourceArray));
+	public static List<Object> convertArrayToList(Object[] sourceArray) {
+		List<Object> targetList = new ArrayList<Object>(Arrays.asList(sourceArray));
 		return targetList;
 	}
 
-	public static List<Object> convertArrayListToList(final ArrayList sourceArray) {
-		final List<Object> targetList = new ArrayList<>(Arrays.asList(sourceArray));
+	public static List<Object> convertArrayListToList(ArrayList sourceArray) {
+		List<Object> targetList = new ArrayList<Object>(Arrays.asList(sourceArray));
 		return targetList;
 	}
 
-	public static void spawnCustomParticle(final Entity entity){
+	public static void spawnCustomParticle(Entity entity){
 		GTplusplus.proxy.generateMysteriousParticles(entity);
-	}
+	}	
 
-	public static void spawnFX(final World world, final int x, final int y, final int z, final String particleName, Object particleName2){
+	public static void spawnFX(World world, int x, int y, int z, String particleName, Object particleName2){
 		if (!world.isRemote){
-			if ((particleName2 == null) || particleName2.equals("")){
+			if (particleName2 == null || particleName2.equals("")){
 				particleName2 = particleName;
 			}
-			final int l = MathUtils.randInt(0, 4);
-			final double d0 = x + 0.5F;
-			final double d1 = y + 0.7F;
-			final double d2 = z + 0.5F;
-			final double d3 = 0.2199999988079071D;
-			final double d4 = 0.27000001072883606D;
+			int l = MathUtils.randInt(0, 4);
+			double d0 = (double)((float)x + 0.5F);
+			double d1 = (double)((float)y + 0.7F);
+			double d2 = (double)((float)z + 0.5F);
+			double d3 = 0.2199999988079071D;
+			double d4 = 0.27000001072883606D;
 
 			if (l == 1)
 			{
@@ -375,14 +377,14 @@ public class Utils {
 		}
 	}
 
-	public static int rgbtoHexValue(final int r, final int g, final int b){
-		if ((r > 255) || (g > 255) || (b > 255) || (r < 0) || (g < 0) || (b < 0)){
+	public static int rgbtoHexValue(int r, int g, int b){	
+		if (r > 255 || g > 255 || b > 255 || r < 0 || g < 0 || b < 0){
 			return 0;
 		}
-		final Color c = new Color(r,g,b);
-		String temp = Integer.toHexString( c.getRGB() & 0xFFFFFF ).toUpperCase();
+		Color c = new Color(r,g,b);
+		String temp = Integer.toHexString( c.getRGB() & 0xFFFFFF ).toUpperCase();	
 
-		//System.out.println( "hex: " + Integer.toHexString( c.getRGB() & 0xFFFFFF ) + " hex value:"+temp);
+		//System.out.println( "hex: " + Integer.toHexString( c.getRGB() & 0xFFFFFF ) + " hex value:"+temp); 
 		temp = Utils.appenedHexNotationToString(String.valueOf(temp));
 		Utils.LOG_WARNING("Made "+temp+" - Hopefully it's not a mess.");
 		Utils.LOG_WARNING("It will decode into "+Integer.decode(temp)+".");
@@ -392,26 +394,26 @@ public class Utils {
 	/*
 	 * http://javadevnotes.com/java-left-pad-string-with-zeros-examples
 	 */
-	public static String leftPadWithZeroes(final String originalString, final int length) {
-		final StringBuilder sb = new StringBuilder();
-		while ((sb.length() + originalString.length()) < length) {
+	public static String leftPadWithZeroes(String originalString, int length) {
+		StringBuilder sb = new StringBuilder();
+		while (sb.length() + originalString.length() < length) {
 			sb.append('0');
 		}
 		sb.append(originalString);
-		final String paddedString = sb.toString();
+		String paddedString = sb.toString();
 		return paddedString;
 	}
 
 	/*
 	 * Original Code by Chandana Napagoda - https://cnapagoda.blogspot.com.au/2011/03/java-hex-color-code-generator.html
-	 */
-	public static Map<Integer, String> hexColourGenerator(final int colorCount){
-		final int maxColorValue = 16777215;
+	 */	
+	public static Map<Integer, String> hexColourGenerator(int colorCount){
+		int maxColorValue = 16777215;
 		// this is decimal value of the "FFFFFF"
-		final int devidedvalue = maxColorValue/colorCount;
+		int devidedvalue = maxColorValue/colorCount;
 		int countValue = 0;
-		final HashMap<Integer, String> hexColorMap = new HashMap<>();
-		for(int a=0; (a < colorCount) && (maxColorValue >= countValue) ; a++){
+		HashMap<Integer, String> hexColorMap = new HashMap<Integer, String>();
+		for(int a=0; a < colorCount && maxColorValue >= countValue ; a++){
 			if(a != 0){
 				countValue+=devidedvalue;
 				hexColorMap.put(a,Integer.toHexString( 0x10000 | countValue).substring(1).toUpperCase());
@@ -426,33 +428,33 @@ public class Utils {
 	/*
 	 * Original Code by Chandana Napagoda - https://cnapagoda.blogspot.com.au/2011/03/java-hex-color-code-generator.html
 	 */
-	public static Map<Integer, String> hexColourGeneratorRandom(final int colorCount){
-		final HashMap<Integer, String> hexColorMap = new HashMap<>();
+	public static Map<Integer, String> hexColourGeneratorRandom(int colorCount){
+		HashMap<Integer, String> hexColorMap = new HashMap<Integer, String>();
 		for(int a=0;a < colorCount; a++){
 			String code = ""+(int)(Math.random()*256);
 			code = code+code+code;
-			final int  i = Integer.parseInt(code);
+			int  i = Integer.parseInt(code);
 			hexColorMap.put(a,Integer.toHexString( 0x1000000 | i).substring(1).toUpperCase());
 			Utils.LOG_WARNING(""+Integer.toHexString( 0x1000000 | i).substring(1).toUpperCase());
 		}
 		return hexColorMap;
 	}
 
-	public static String appenedHexNotationToString(final Object hexAsStringOrInt){
-		final String hexChar = "0x";
+	public static String appenedHexNotationToString(Object hexAsStringOrInt){
+		String hexChar = "0x";
 		String result;
 		if (hexAsStringOrInt.getClass() == String.class){
 
 			if (((String) hexAsStringOrInt).length() != 6){
-				final String temp = leftPadWithZeroes((String) hexAsStringOrInt, 6);
+				String temp = leftPadWithZeroes((String) hexAsStringOrInt, 6);
 				result = temp;
 			}
 			result = hexChar+hexAsStringOrInt;
 			return result;
 		}
-		else if (hexAsStringOrInt.getClass() == Integer.class){
+		else if (hexAsStringOrInt.getClass() == Integer.class){			
 			if (((String) hexAsStringOrInt).length() != 6){
-				final String temp = leftPadWithZeroes((String) hexAsStringOrInt, 6);
+				String temp = leftPadWithZeroes((String) hexAsStringOrInt, 6);
 				result = temp;
 			}
 			result = hexChar+String.valueOf(hexAsStringOrInt);
@@ -463,22 +465,22 @@ public class Utils {
 		}
 	}
 
-	public static Integer appenedHexNotationToInteger(final int hexAsStringOrInt){
-		final String hexChar = "0x";
+	public static Integer appenedHexNotationToInteger(int hexAsStringOrInt){
+		String hexChar = "0x";
 		String result;
 		Utils.LOG_WARNING(String.valueOf(hexAsStringOrInt));
 		result = hexChar+String.valueOf(hexAsStringOrInt);
 		return Integer.getInteger(result);
 	}
 
-	public static boolean doesEntryExistAlreadyInOreDictionary(final String OreDictName){
+	public static boolean doesEntryExistAlreadyInOreDictionary(String OreDictName){
 		if (OreDictionary.getOres(OreDictName).size() != 0) {
 			return true;
 		}
 		return false;
 	}
 
-	public static boolean invertBoolean(final boolean booleans){
+	public static boolean invertBoolean(boolean booleans){
 		if (booleans == true){
 			return false;
 		}
@@ -486,34 +488,34 @@ public class Utils {
 	}
 
 	private static short cellID = 15;
-	public static ItemStack createInternalNameAndFluidCell(final String s){
+	public static ItemStack createInternalNameAndFluidCell(String s){
 		Utils.LOG_WARNING("1");
-		final InternalName yourName = EnumHelper.addEnum(InternalName.class, s, new Class[0], new Object[0]);
+		InternalName yourName = EnumHelper.addEnum(InternalName.class, s, new Class[0], new Object[0]);
 		Utils.LOG_WARNING("2 "+yourName.name());
-		final ItemCell item = (ItemCell)Ic2Items.cell.getItem();
+		ItemCell item = (ItemCell)Ic2Items.cell.getItem();
 		Utils.LOG_WARNING("3 "+item.getUnlocalizedName());
 		try
 		{
 			Utils.LOG_WARNING("4");
-			final Class<? extends ItemCell> clz = item.getClass();
+			Class<? extends ItemCell> clz = item.getClass();
 			Utils.LOG_WARNING("5 "+clz.getSimpleName());
-			final Method methode = clz.getDeclaredMethod("addCell", int.class, InternalName.class, Block[].class);
+			Method methode = clz.getDeclaredMethod("addCell", int.class, InternalName.class, Block[].class);
 			Utils.LOG_WARNING("6 "+methode.getName());
 			methode.setAccessible(true);
 			Utils.LOG_WARNING("7 "+methode.isAccessible());
-			final ItemStack temp = (ItemStack) methode.invoke(item, cellID++, yourName, new Block[0]);
+			ItemStack temp = (ItemStack) methode.invoke(item, cellID++, yourName, new Block[0]);
 			Utils.LOG_WARNING("Successfully created "+temp.getDisplayName()+"s.");
 			FluidContainerRegistry.registerFluidContainer(FluidUtils.getFluidStack(s.toLowerCase(), 0), temp.copy(), Ic2Items.cell.copy());
 			ItemUtils.addItemToOreDictionary(temp.copy(), "cell"+s);
 			return temp;
 		}
-		catch(final Exception e){
+		catch(Exception e){
 			e.printStackTrace();
 		}
 		return null;
 	}
 
-	public static String sanitizeString(final String input){
+	public static String sanitizeString(String input){
 		String temp;
 		String output;
 
@@ -531,39 +533,39 @@ public class Utils {
 		temp = temp.replace("[", "");
 		temp = temp.replace("]", "");
 		temp = temp.replace(" ", "");
-		output = temp;
+		output = temp;		
 		return output;
 
 	}
-
-	public static String[] parseVersion(final String version){
+	
+	public static String[] parseVersion(String version){
 		return parseVersion(version, "//.");
 	}
-
-	public static String[] parseVersion(final String version, final String delimiter){
-		final String[] versionArray = version.split(delimiter);
+	
+	public static String[] parseVersion(String version, String delimiter){
+		String[] versionArray = version.split(delimiter);
 		return versionArray;
 	}
-
-	public static Versioning compareModVersion (final String currentVersion, final String expectedVersion){
+	
+	public static Versioning compareModVersion (String currentVersion, String expectedVersion){
 		return compareModVersion(currentVersion, expectedVersion, "//.");
 	}
-
-	public static Versioning compareModVersion (final String currentVersion, final String expectedVersion, final String delimiter){
-		final String[] a = parseVersion(currentVersion, delimiter);
-		final String[] b = parseVersion(expectedVersion, delimiter);
-		final int[] c = new int[a.length];
-		final int[] d = new int[b.length];
+	
+	public static Versioning compareModVersion (String currentVersion, String expectedVersion, String delimiter){
+		String[] a = parseVersion(currentVersion, delimiter);
+		String[] b = parseVersion(expectedVersion, delimiter);
+		int[] c = new int[a.length];
+		int[] d = new int[b.length];
 		for (int r=0;r<a.length;r++){
 			c[r]=Integer.parseInt(a[r]);
 		}
 		for (int r=0;r<b.length;r++){
 			d[r]=Integer.parseInt(b[r]);
 		}
-		final Versioning[] e = new Versioning[MathUtils.returnLargestNumber(c.length, d.length)];
+		Versioning[] e = new Versioning[MathUtils.returnLargestNumber(c.length, d.length)];
 		for (int r=0;r<e.length;r++){
-
-
+			
+			
 			if (c[r] > d[r]){
 				e[r] = Versioning.NEWER;
 			}
@@ -574,7 +576,7 @@ public class Utils {
 				e[r] = Versioning.EQUAL;
 			}
 		}
-
+		
 		for (int r=0;r<e.length;r++){
 			if (e[0] == Versioning.NEWER){
 				return Versioning.NEWER;
@@ -582,69 +584,69 @@ public class Utils {
 			else if (e[0] == Versioning.OLDER){
 				return Versioning.OLDER;
 			}
-			else {
+			else {				
 				if (e[r] == Versioning.OLDER){
-
+					
 				}
-
+				
 				return Versioning.NEWER;
 			}
 		}
-
-		return null;
+		
+	return null;	
 	}
+	
+	
 
-
-
-	public static ToolMaterial generateToolMaterialFromGT(final Materials gtMaterial){
-		final String name = Utils.sanitizeString(gtMaterial.mDefaultLocalName);
-		final int harvestLevel = gtMaterial.mToolQuality;
-		final int durability = gtMaterial.mDurability;
-		final float damage = gtMaterial.mToolQuality;
-		final int efficiency = (int) gtMaterial.mToolSpeed;
-		final int enchantability = gtMaterial.mEnchantmentToolsLevel;
-		final ToolMaterial temp = EnumHelper.addToolMaterial(name, harvestLevel, durability, efficiency, damage, enchantability);
+	public static ToolMaterial generateToolMaterialFromGT(Materials gtMaterial){
+		String name = Utils.sanitizeString(gtMaterial.mDefaultLocalName);
+		int harvestLevel = gtMaterial.mToolQuality;
+		int durability = gtMaterial.mDurability;
+		float damage = gtMaterial.mToolQuality;
+		int efficiency = (int) gtMaterial.mToolSpeed;
+		int enchantability = gtMaterial.mEnchantmentToolsLevel;
+		ToolMaterial temp = EnumHelper.addToolMaterial(name, harvestLevel, durability, efficiency, damage, enchantability);
 		return temp;
 
 	}
 
-	public static ToolMaterial generateToolMaterial(final Material material){
-		final String name = material.getLocalizedName();
-		final int harvestLevel = material.vHarvestLevel;
-		final int durability = (int) material.vDurability;
-		final float damage = material.vToolQuality;
-		final int efficiency = material.vToolQuality;
+	public static ToolMaterial generateToolMaterial(Material material){
+		String name = material.getLocalizedName();
+		int harvestLevel = material.vHarvestLevel;
+		int durability = (int) material.vDurability;
+		float damage = material.vToolQuality;
+		int efficiency = (int) material.vToolQuality;
 		//int enchantability = material.mEnchantmentToolsLevel;
 		Utils.LOG_INFO("ToolMaterial stats for "+material.getLocalizedName()+" | harvestLevel:"+harvestLevel+" | durability:"+durability+" | toolQuality:"+damage+" | toolSpeed:"+damage);
-		final ToolMaterial temp = EnumHelper.addToolMaterial(name, harvestLevel, durability, efficiency, damage, 0);
+		ToolMaterial temp = EnumHelper.addToolMaterial(name, harvestLevel, durability, efficiency, damage, 0);
 		return temp;
 
 	}
-
-
-
-
-
-
-
-
-
-
-
-
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	public static enum Versioning {
-		EQUAL(0),
-		NEWER(1),
-		OLDER(-1);
-		private final int versioningInfo;
-		private Versioning (final int versionStatus){
-			this.versioningInfo = versionStatus;
-		}
-		public int getTexture() {
-			return this.versioningInfo;
-		}
-	}
-
+    	EQUAL(0),
+    	NEWER(1),
+    	OLDER(-1);
+    	private int versioningInfo;
+    	private Versioning (final int versionStatus){
+    		this.versioningInfo = versionStatus;
+    	}
+    	public int getTexture() {
+    		return versioningInfo;
+    	}    
+    }
+	
 
 
 }
diff --git a/src/Java/gtPlusPlus/core/util/item/ItemUtils.java b/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
index 8fe80ff184..0cacb4e84e 100644
--- a/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
@@ -311,7 +311,7 @@ public class ItemUtils {
 
 	public static MultiPickaxeBase generateMultiPick(final boolean GT_Durability, final Materials material){
 		final ToolMaterial customMaterial = Utils.generateToolMaterialFromGT(material);
-		final Object enchant = new Pair(material.mEnchantmentTools, material.mEnchantmentToolsLevel);
+		final Object enchant = new Pair(material.mEnchantmentTools, (Byte.valueOf(material.mEnchantmentToolsLevel)));
 		return generateMultiPick(GT_Durability, customMaterial, material.mDefaultLocalName, material.mDurability, material.mRGBa, enchant);
 	}