$ Fixed milled byproducts not using the correct texture.

$ Fixed handling of IC2 EnumHelper code.
$ Added a dummy RecipeMap to stop Bartworks crashing when it can't find it.

3 files changed, 8 insertions, 11 deletions

diff --git a/src/Java/gregtech/api/util/GTPP_Recipe.java b/src/Java/gregtech/api/util/GTPP_Recipe.java
index a00306ddcc..ab6207299b 100644
--- a/src/Java/gregtech/api/util/GTPP_Recipe.java
+++ b/src/Java/gregtech/api/util/GTPP_Recipe.java
@@ -378,6 +378,8 @@ public class GTPP_Recipe extends GT_Recipe  implements IComparableRecipe {
 
 		//Basic Washer Map
 		public static final GTPP_Recipe_Map_Internal sSimpleWasherRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(3), "gt.recipe.simplewasher", "Simple Dust Washer", null, RES_PATH_GUI + "basicmachines/PotionBrewer", 1, 1, 0, 0, 1, E, 1, E, true, true);
+
+		public static final GT_Recipe_Map sSimpleWasherRecipes_FakeFuckBW = new GT_Recipe_Map(new HashSet<GT_Recipe>(3), "gt.recipe.simplewasher", "Fuck you Bart", null, RES_PATH_GUI + "basicmachines/PotionBrewer", 1, 1, 0, 0, 1, E, 1, E, true, false);
 		
 		public static final GTPP_Recipe_Map sChemicalPlantRecipes = new GTPP_Recipe_Map(
 				new HashSet<GTPP_Recipe>(100),
diff --git a/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java b/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
index 356fdac24e..883eb241da 100644
--- a/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
+++ b/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
@@ -178,9 +178,9 @@ public class BaseOreComponent extends Item{
 	@SideOnly(Side.CLIENT)
 	public void registerIcons(final IIconRegister par1IconRegister){
 		if (this.componentType == ComponentTypes.MILLED) {
-			this.base = par1IconRegister.registerIcon(CORE.MODID + ":" + "processing/MilledOre/"+this.componentType.getComponent());
+			this.base = par1IconRegister.registerIcon(CORE.MODID + ":" + "processing/MilledOre/milled");
 			if (this.componentType.hasOverlay()){
-				this.overlay = par1IconRegister.registerIcon(CORE.MODID + ":" + "processing/MilledOre/"+this.componentType.getComponent()+"_Overlay");
+				this.overlay = par1IconRegister.registerIcon(CORE.MODID + ":" + "processing/MilledOre/milled_OVERLAY");
 			}
 		}		
 		else if (CORE.ConfigSwitches.useGregtechTextures){
diff --git a/src/Java/gtPlusPlus/xmod/ic2/CustomInternalName.java b/src/Java/gtPlusPlus/xmod/ic2/CustomInternalName.java
index 18fb286d15..a349d7f86e 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/CustomInternalName.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/CustomInternalName.java
@@ -1,6 +1,5 @@
 package gtPlusPlus.xmod.ic2;
 
-import gtPlusPlus.core.util.data.EnumUtils;
 import ic2.core.init.InternalName;
 import net.minecraftforge.common.util.EnumHelper;
 
@@ -12,14 +11,10 @@ public class CustomInternalName {
 	public static InternalName aHazmatBootsEx;
 	
 	public static void init() {
-		EnumHelper.addEnum(InternalName.class, "itemArmorHazmatHelmetEx", new Class[] {}, new Object[] {});
-		EnumHelper.addEnum(InternalName.class, "itemArmorHazmatChestplateEx", new Class[] {}, new Object[] {});
-		EnumHelper.addEnum(InternalName.class, "itemArmorHazmatLeggingsEx", new Class[] {}, new Object[] {});
-		EnumHelper.addEnum(InternalName.class, "itemArmorRubBootsEx", new Class[] {}, new Object[] {});			
-		aHazmatHelmetEx = EnumUtils.getValue(InternalName.class, "itemArmorHazmatHelmetEx");
-		aHazmatChestEx = EnumUtils.getValue(InternalName.class, "itemArmorHazmatChestplateEx");
-		aHazmatLegsEx = EnumUtils.getValue(InternalName.class, "itemArmorHazmatLeggingsEx");
-		aHazmatBootsEx = EnumUtils.getValue(InternalName.class, "itemArmorRubBootsEx");		
+		aHazmatHelmetEx = EnumHelper.addEnum(InternalName.class, "itemArmorHazmatHelmetEx", new Class[] {}, new Object[] {});
+		aHazmatChestEx = EnumHelper.addEnum(InternalName.class, "itemArmorHazmatChestplateEx", new Class[] {}, new Object[] {});
+		aHazmatLegsEx = EnumHelper.addEnum(InternalName.class, "itemArmorHazmatLeggingsEx", new Class[] {}, new Object[] {});
+		aHazmatBootsEx = EnumHelper.addEnum(InternalName.class, "itemArmorRubBootsEx", new Class[] {}, new Object[] {});	
 	}