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

3 files changed, 27 insertions, 1 deletions

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;
+	} 
+
 }