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

4 files changed, 14 insertions, 10 deletions

diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 6f3e62659f..fd2b98c7be 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -96,6 +96,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.everglades.GTplusplus_Everglades;
+import gtPlusPlus.preloader.CORE_Preloader;
 import gtPlusPlus.xmod.cofh.HANDLER_COFH;
 import gtPlusPlus.xmod.eio.material.MaterialEIO;
 import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechItems;
@@ -388,7 +389,7 @@ public final class ModItems {
 		itemDummyResearch = new ItemDummyResearch();
 		
 		//Debug Loading
-		if (CORE.DEBUG){
+		if (CORE_Preloader.DEBUG_MODE){
 			DEBUG_INIT.registerItems();
 		}
 
diff --git a/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java b/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
index 24c87c3334..356fdac24e 100644
--- a/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
+++ b/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
@@ -18,6 +18,7 @@ import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.EntityUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.xmod.gregtech.api.enums.CustomOrePrefix;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
@@ -92,7 +93,7 @@ public class BaseOreComponent extends Item{
 			aKey = OrePrefixes.dustPure.name();
 		}
 		else if (componentType == ComponentTypes.MILLED) {
-			aKey = "milled";
+			aKey = CustomOrePrefix.milled.get().name();
 		}
 
 		ItemStack x = aMap.get(aKey);
diff --git a/src/Java/gtPlusPlus/core/item/food/BaseItemMetaFood.java b/src/Java/gtPlusPlus/core/item/food/BaseItemMetaFood.java
index d6922fbf92..94d5a8e80f 100644
--- a/src/Java/gtPlusPlus/core/item/food/BaseItemMetaFood.java
+++ b/src/Java/gtPlusPlus/core/item/food/BaseItemMetaFood.java
@@ -102,16 +102,17 @@ public class BaseItemMetaFood extends ItemFood {
 			mSpecialBehaviourMap.put(aMetaID, aSpecialBehaviour);			
 		}
 		mOreDictNames.put(aMetaID, aOreDictNames);
-		registerFoodToOreDict(aMetaID);
 	}
 	
-	private static void registerFoodToOreDict(int aMetaID) {
-		ArrayList<String> aOreDictNames = mOreDictNames.get(aMetaID);
-		if (aOreDictNames != null && !aOreDictNames.isEmpty()) {
-			ItemStack aFoodStack = ItemUtils.simpleMetaStack(ModItems.itemMetaFood, aMetaID, 1);
-			for (String aOreName : aOreDictNames) {
-				ItemUtils.addItemToOreDictionary(aFoodStack, aOreName);				
-			}
+	public static void registerFoodsToOreDict() {
+		for (int aMetaID=0; aMetaID < mTotalMetaItems; aMetaID++) {
+			ArrayList<String> aOreDictNames = mOreDictNames.get(aMetaID);
+			if (aOreDictNames != null && !aOreDictNames.isEmpty()) {
+				ItemStack aFoodStack = ItemUtils.simpleMetaStack(ModItems.itemMetaFood, aMetaID, 1);
+				for (String aOreName : aOreDictNames) {
+					ItemUtils.addItemToOreDictionary(aFoodStack, aOreName);				
+				}
+			}			
 		}
 	}
 
diff --git a/src/Java/gtPlusPlus/core/item/init/ItemsFoods.java b/src/Java/gtPlusPlus/core/item/init/ItemsFoods.java
index 7f1ba720cc..e5c403c503 100644
--- a/src/Java/gtPlusPlus/core/item/init/ItemsFoods.java
+++ b/src/Java/gtPlusPlus/core/item/init/ItemsFoods.java
@@ -48,6 +48,7 @@ public class ItemsFoods {
 		GT_OreDictUnificator.registerOre("foodHotCurriedSausages", ItemUtils.getItemStackFromFQRN(CORE.MODID+":itemHotFoodCurriedSausages", 1));
 
 		ModItems.itemMetaFood = new BaseItemMetaFood();
+		BaseItemMetaFood.registerFoodsToOreDict();
 		addCookingRecipes();
 		addFoodDropsToMobs();