+ Added Custom NEI Handler for IsaMIll.

+ Added Death by IsaMIll.
% Moved debug mode switch to AsmConfig.
$ Fixed handling of custom OrePrefixes.
$ Fixed OreDict registration of MetaFoodItems.
$ Improved handling of Core Classes being static initialised too early.
$ Fixed client-side bug in Distillus which would cause an infinite loop.
$ Fixed bug in ForgeEnumHelper.
$ Fixed bug in setField methods from ReflectionUtils.

6 files changed, 72 insertions, 10 deletions

diff --git a/src/Java/gtPlusPlus/core/util/debug/DEBUG_INIT.java b/src/Java/gtPlusPlus/core/util/debug/DEBUG_INIT.java
index b1cd1697f5..f8fc15c778 100644
--- a/src/Java/gtPlusPlus/core/util/debug/DEBUG_INIT.java
+++ b/src/Java/gtPlusPlus/core/util/debug/DEBUG_INIT.java
@@ -1,12 +1,12 @@
 package gtPlusPlus.core.util.debug;
 
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.preloader.CORE_Preloader;
 
 public class DEBUG_INIT {
 
 	public static void registerBlocks(){
 		//Debug Loading
-		if (CORE.DEBUG){
+		if (CORE_Preloader.DEBUG_MODE){
 
 		}
 	}
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/EntityUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/EntityUtils.java
index bba2e55bc2..66f9e2453d 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/EntityUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/EntityUtils.java
@@ -74,6 +74,13 @@ public class EntityUtils {
 		final int blockZ = MathHelper.floor_double(parEntity.posZ);
 		return new BlockPos(blockX, blockY, blockZ, parEntity.worldObj);
 	}
+	
+	public static BlockPos findBlockPosOfEntity(final Entity parEntity){
+		final int blockX = MathHelper.floor_double(parEntity.posX);
+		final int blockY = MathHelper.floor_double(parEntity.boundingBox.minY);
+		final int blockZ = MathHelper.floor_double(parEntity.posZ);
+		return new BlockPos(blockX, blockY, blockZ, parEntity.worldObj);
+	}
 
 	//TODO
 	public static void registerEntityToBiomeSpawns(final Class<EntityLiving> classy, final EnumCreatureType EntityType, final BiomeGenBase baseBiomeGen){
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index b2f048565f..725799a43d 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -37,6 +37,7 @@ import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gtPlusPlus.preloader.CORE_Preloader;
 import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaTool;
 import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
 import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_DustGeneration;
@@ -354,7 +355,7 @@ public class ItemUtils {
 	}
 
 	public static ItemStack getItemStackOfAmountFromOreDictNoBroken(String oredictName, final int amount) {
-		if (CORE.DEBUG) {
+		if (CORE_Preloader.DEBUG_MODE) {
 			Logger.WARNING("Looking up: " + oredictName + " - from method: " + ReflectionUtils.getMethodName(1));
 			Logger.WARNING("Looking up: " + oredictName + " - from method: " + ReflectionUtils.getMethodName(2));
 			Logger.WARNING("Looking up: " + oredictName + " - from method: " + ReflectionUtils.getMethodName(3));
@@ -1275,6 +1276,16 @@ public class ItemUtils {
 		}
 		return false;
 	}
+	
+	public static boolean isMillingBall(ItemStack aStack) {
+		if (GT_Utility.areStacksEqual(aStack, GenericChem.mMillingBallAlumina, true)) {
+			return true;
+		}
+		if (GT_Utility.areStacksEqual(aStack, GenericChem.mMillingBallSoapstone, true)) {
+			return true;
+		}
+		return false;
+	}
 
 	public static String getLocalizedNameOfBlock(Block aBlock, int aMeta) {
 		return LangUtils.getLocalizedNameOfBlock(aBlock, aMeta);
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/PlayerUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/PlayerUtils.java
index 9a8a8e691c..e64414b493 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/PlayerUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/PlayerUtils.java
@@ -188,4 +188,12 @@ public class PlayerUtils {
 		Utils.sendServerMessage(string);		
 	}
 
+	public static boolean isCreative(EntityPlayer aPlayer) {
+		return aPlayer.capabilities.isCreativeMode;
+	}
+	
+	public static boolean canTakeDamage(EntityPlayer aPlayer) {
+		return !aPlayer.capabilities.disableDamage;
+	} 
+
 }
diff --git a/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java b/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
index 4d8a02d800..e45d27b926 100644
--- a/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
+++ b/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
@@ -365,7 +365,13 @@ public class ReflectionUtils {
 
 
 	public static boolean setField(final Object object, final String fieldName, final Object fieldValue) {
-		Class<?> clazz = object.getClass();
+		Class<?> clazz;
+		if (object instanceof Class) {
+			clazz = (Class<?>) object;
+		}
+		else {
+			clazz = object.getClass();
+		}
 		while (clazz != null) {
 			try {
 				final Field field = getField(clazz, fieldName);
@@ -387,7 +393,13 @@ public class ReflectionUtils {
 	}
 
 	public static boolean setField(final Object object, final Field field, final Object fieldValue) {
-		Class<?> clazz = object.getClass();
+		Class<?> clazz;
+		if (object instanceof Class) {
+			clazz = (Class<?>) object;
+		}
+		else {
+			clazz = object.getClass();
+		}
 		while (clazz != null) {
 			try {
 				final Field field2 = getField(clazz, field.getName());
@@ -522,6 +534,25 @@ public class ReflectionUtils {
 		return false;
 	}
 
+
+	public static Object invokeNonBool(Object objectInstance, Method method, Object[] values){
+		if (objectInstance == null || method == null || values == null){
+			return false;
+		}		
+		String methodName = method.getName();
+		Class<?> mLocalClass = (objectInstance instanceof Class ? (Class<?>) objectInstance : objectInstance.getClass());
+		Logger.REFLECTION("Trying to invoke "+methodName+" on an instance of "+mLocalClass.getCanonicalName()+".");
+		try {
+				return method.invoke(objectInstance, values);
+		}
+		catch (SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+			Logger.REFLECTION("Failed to Dynamically invoke "+methodName+" on an object of type: "+mLocalClass.getName());
+		}		
+
+		Logger.REFLECTION("Invoke failed or did something wrong.");		
+		return null;
+	}
+
 	public static Object invokeNonBool(Object objectInstance, String methodName, Class[] parameters, Object[] values){
 		if (objectInstance == null || methodName == null || parameters == null || values == null){
 			return false;
@@ -973,9 +1004,9 @@ public class ReflectionUtils {
 	 */
 	private static void makeModifiable(Field nameField) throws Exception {
 		nameField.setAccessible(true);
-        Field modifiers = getField(Field.class, "modifiers");
-        modifiers.setAccessible(true);
-        modifiers.setInt(nameField, nameField.getModifiers() & ~Modifier.FINAL);
+		Field modifiers = getField(Field.class, "modifiers");
+		modifiers.setAccessible(true);
+		modifiers.setInt(nameField, nameField.getModifiers() & ~Modifier.FINAL);
 	}
 
 
diff --git a/src/Java/gtPlusPlus/core/util/sys/GeoUtils.java b/src/Java/gtPlusPlus/core/util/sys/GeoUtils.java
index 6ec6662a44..0e5a33b948 100644
--- a/src/Java/gtPlusPlus/core/util/sys/GeoUtils.java
+++ b/src/Java/gtPlusPlus/core/util/sys/GeoUtils.java
@@ -3,17 +3,22 @@ package gtPlusPlus.core.util.sys;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.net.*;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLConnection;
 
 import org.apache.http.client.utils.URIBuilder;
 
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.preloader.CORE_Preloader;
 
 public class GeoUtils {
 
 	public static String determineUsersCountry(){
-		if (!CORE.DEBUG && !CORE.DEVENV) {
+		if (!CORE_Preloader.DEBUG_MODE && !CORE.DEVENV) {
 		try {
 		if (NetworkUtils.checkNetworkIsAvailableWithValidInterface()){
 			return getUsersCountry();