+ 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, 78 insertions, 55 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/CustomOrePrefix.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/CustomOrePrefix.java
index 050081fc82..9647b00578 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/CustomOrePrefix.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/CustomOrePrefix.java
@@ -3,23 +3,31 @@ package gtPlusPlus.xmod.gregtech.api.enums;
 import static gregtech.api.enums.GT_Values.B;
 
 import gregtech.api.enums.OrePrefixes;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
 import net.minecraftforge.common.util.EnumHelper;
 
-public class CustomOrePrefix {
+public enum CustomOrePrefix {
 
-	public static CustomOrePrefix Milled;
-
-	static {
-		Milled = new CustomOrePrefix("Milled Ores", "Milled ", " Ore", true, true, false, false, false, false, false, false, false, true, B[3], -1, 64, -1);
-	}
+	milled("Milled Ores", "Milled ", " Ore", true, true, false, false, false, false, false, false, false, true, B[3], -1, 64, -1);
 	
-	public static void init() {
-		// Does nothing except run the static{} block
-	}
-
+	private final String mRegularLocalName;
 	private final String mLocalizedMaterialPre;
+	private final String mLocalizedMaterialPost;
+	private final boolean mIsUnificatable;
+	private final boolean mIsMaterialBased;
+	private final boolean mIsSelfReferencing;
+	private final boolean mIsContainer;
+	private final boolean mDontUnificateActively;
+	private final boolean mIsUsedForBlocks;
+	private final boolean mAllowNormalRecycling;
+	private final boolean mGenerateDefaultItem;
+	private final boolean mIsEnchantable;
+	private final boolean mIsUsedForOreProcessing;
+	private final int mMaterialGenerationBits;
+	private final long mMaterialAmount;
+	private final int mDefaultStackSize;
+	private final int mTextureindex;	
+	
+	private OrePrefixes mSelfReference;
 	
 	private CustomOrePrefix(
 			String aRegularLocalName,
@@ -38,52 +46,67 @@ public class CustomOrePrefix {
 			int aMaterialGenerationBits,
 			long aMaterialAmount,
 			int aDefaultStackSize,
-			int aTextureindex) {
-
+			int aTextureindex) {		
+		
+		mRegularLocalName = aRegularLocalName;
 		mLocalizedMaterialPre = aLocalizedMaterialPre;
+		mLocalizedMaterialPost = aLocalizedMaterialPost;
+		mIsUnificatable = aIsUnificatable;
+		mIsMaterialBased = aIsMaterialBased;
+		mIsSelfReferencing = aIsSelfReferencing;
+		mIsContainer = aIsContainer;
+		mDontUnificateActively = aDontUnificateActively;
+		mIsUsedForBlocks = aIsUsedForBlocks;
+		mAllowNormalRecycling = aAllowNormalRecycling;
+		mGenerateDefaultItem = aGenerateDefaultItem;
+		mIsEnchantable = aIsEnchantable;
+		mIsUsedForOreProcessing = aIsUsedForOreProcessing;
+		mMaterialGenerationBits = aMaterialGenerationBits;
+		mMaterialAmount = aMaterialAmount;
+		mDefaultStackSize = aDefaultStackSize;
+		mTextureindex = aTextureindex;	
 		
-		// Add this to the GT Enum
-		EnumHelper.addEnum(OrePrefixes.class, aLocalizedMaterialPre, new Object[] {
-				aRegularLocalName,
-				aLocalizedMaterialPre,
-				aLocalizedMaterialPost,
-				aIsUnificatable,
-				aIsMaterialBased,
-				aIsSelfReferencing,
-				aIsContainer,
-				aDontUnificateActively,
-				aIsUsedForBlocks,
-				aAllowNormalRecycling,
-				aGenerateDefaultItem,
-				aIsEnchantable,
-				aIsUsedForOreProcessing,
-				aMaterialGenerationBits,
-				aMaterialAmount,
-				aDefaultStackSize,
-				aTextureindex}
-		);
+	}
+	
+	public final boolean addToEnum() {
 		
-		Logger.INFO("Registered custom OrePrefixes '"+aLocalizedMaterialPre+"'. Success? "+checkEntryWasAdded(this));
+		mSelfReference = EnumHelper.addEnum(OrePrefixes.class, this.name(),
+				new Class[] {
+						String.class,
+						String.class, String.class, boolean.class, 
+						boolean.class, boolean.class, boolean.class, 
+						boolean.class, boolean.class, boolean.class, 
+						boolean.class, boolean.class, boolean.class, 
+						int.class, long.class, int.class, int.class	
+				},
+				new Object[] {
+				mRegularLocalName,
+				mLocalizedMaterialPre,
+				mLocalizedMaterialPost,
+				mIsUnificatable,
+				mIsMaterialBased,
+				mIsSelfReferencing,
+				mIsContainer,
+				mDontUnificateActively,
+				mIsUsedForBlocks,
+				mAllowNormalRecycling,
+				mGenerateDefaultItem,
+				mIsEnchantable,
+				mIsUsedForOreProcessing,
+				mMaterialGenerationBits,
+				mMaterialAmount,
+				mDefaultStackSize,
+				mTextureindex});
 		
+		return mSelfReference != null;
 	}
 	
-	private static final boolean checkEntryWasAdded(CustomOrePrefix aCustomPrefixObject) {
-		for (OrePrefixes o :OrePrefixes.values()) {
-			if (o.mLocalizedMaterialPre.equals(aCustomPrefixObject.mLocalizedMaterialPre)) {
-				return true;
-			}
-		}
-		return false;
+	public static final boolean checkEntryWasAdded(CustomOrePrefix aCustomPrefixObject) {
+		return aCustomPrefixObject.mSelfReference != null;
 	}
 	
-	public static OrePrefixes get(CustomOrePrefix aCustomPrefixObject) {
-		for (OrePrefixes o :OrePrefixes.values()) {
-			if (o.mLocalizedMaterialPre.equals(aCustomPrefixObject.mLocalizedMaterialPre)) {
-				return o;
-			}
-		}		
-		CORE.crash("Tried to obtain an invalid custom OrePrefixes object");
-		return null;
+	public OrePrefixes get() {
+		return mSelfReference;
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SteamCondenser.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SteamCondenser.java
index f472fc9edb..e3f2f9d41b 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SteamCondenser.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SteamCondenser.java
@@ -1,11 +1,10 @@
 package gtPlusPlus.xmod.gregtech.api.gui;
 
-import net.minecraft.entity.player.InventoryPlayer;
-
 import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.preloader.CORE_Preloader;
+import net.minecraft.entity.player.InventoryPlayer;
 
 public class GUI_SteamCondenser extends GT_GUIContainerMetaTile_Machine
 {
@@ -20,7 +19,7 @@ public class GUI_SteamCondenser extends GT_GUIContainerMetaTile_Machine
 	protected void drawGuiContainerForegroundLayer(final int par1, final int par2)
 	{
 		this.fontRendererObj.drawString("Condenser", 8, 4, 4210752);
-		if (CORE.DEBUG){
+		if (CORE_Preloader.DEBUG_MODE){
 			this.tickTime = ((CONTAINER_SteamCondenser)this.mContainer).mTickingTime;
 			this.fontRendererObj.drawString("Tick Time: "+this.tickTime, 8, 12, 4210752);
 		}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
index b6b75808fc..ea14320f93 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
@@ -55,6 +55,7 @@ import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gtPlusPlus.preloader.CORE_Preloader;
 import gtPlusPlus.preloader.asm.AsmConfig;
 import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_MultiMachine;
 import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_MultiMachine_NoPlayerInventory;
@@ -89,7 +90,7 @@ public abstract class GregtechMeta_MultiBlockBase extends GT_MetaTileEntity_Mult
 		Logger.MACHINE_INFO("Found .08 findRecipe method? "+(a08 != null));
 		Logger.MACHINE_INFO("Found .09 findRecipe method? "+(a09 != null));
 
-		if (CORE.DEBUG) {
+		if (CORE_Preloader.DEBUG_MODE) {
 			aLogger = ReflectionUtils.getMethod(Logger.class, "INFO", String.class);				
 		}
 		else {