$ Cleaned up the entire project.

> Much neat, very nices.

7 files changed, 1877 insertions, 1205 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java
index e2af820c16..d6031edb23 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java
@@ -10,82 +10,72 @@ import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
 
 public class CustomGtTextures {
-    public enum ItemIcons implements IIconContainer, Runnable {
-        VOID // The Empty Texture
-        , RENDERING_ERROR, WRENCH, MORTAR, CROWBAR,
-        JACKHAMMER, WIRE_CUTTER, KNIFE, BUTCHERYKNIFE,
-        SICKLE, SCOOP, GRAFTER, PLUNGER, ROLLING_PIN,
-        HANDLE_SWORD, HANDLE_FILE, HANDLE_SAW,
-        HANDLE_SCREWDRIVER, HANDLE_BUZZSAW,
-        HANDLE_ELECTRIC_SCREWDRIVER, HANDLE_SOLDERING,
-        POWER_UNIT_LV, POWER_UNIT_MV, POWER_UNIT_HV,
-        DURABILITY_BAR_0, DURABILITY_BAR_1, DURABILITY_BAR_2,
-        DURABILITY_BAR_3, DURABILITY_BAR_4, DURABILITY_BAR_5,
-        DURABILITY_BAR_6, DURABILITY_BAR_7, DURABILITY_BAR_8,
-        ENERGY_BAR_0, ENERGY_BAR_1, ENERGY_BAR_2, ENERGY_BAR_3,
-        ENERGY_BAR_4, ENERGY_BAR_5, ENERGY_BAR_6, ENERGY_BAR_7,
-        ENERGY_BAR_8,
-        
-        SKOOKUMCHOOCHER, TURBINE_SMALL, TURBINE_LARGE, TURBINE_HUGE;      
-
-        public static final ITexture[] ERROR_RENDERING = new ITexture[]{new GT_RenderedTexture(RENDERING_ERROR)};
-
-        protected IIcon mIcon, mOverlay;
-
-        private ItemIcons() {
-            GregTech_API.sGTItemIconload.add(this);
-        }
-
-        @Override
-        public IIcon getIcon() {
-            return mIcon;
-        }
-
-        @Override
-        public IIcon getOverlayIcon() {
-            return mOverlay;
-        }
-
-        @Override
-        public ResourceLocation getTextureFile() {
-            return TextureMap.locationItemsTexture;
-        }
-
-        @Override
-        public void run() {
-            mIcon = GregTech_API.sItemIcons.registerIcon(CORE.RES_PATH_ITEM + "iconsets/" + this);
-            mOverlay = GregTech_API.sItemIcons.registerIcon(CORE.RES_PATH_ITEM + "iconsets/" + this + "_OVERLAY");
-        }
-
-        public static class CustomIcon implements IIconContainer, Runnable {
-            protected IIcon mIcon, mOverlay;
-            protected String mIconName;
-
-            public CustomIcon(String aIconName) {
-                mIconName = aIconName;
-                GregTech_API.sGTItemIconload.add(this);
-            }
-
-            @Override
-            public IIcon getIcon() {
-                return mIcon;
-            }
-
-            @Override
-            public IIcon getOverlayIcon() {
-                return mOverlay;
-            }
-
-            @Override
-            public void run() {
-                mIcon = GregTech_API.sItemIcons.registerIcon(CORE.RES_PATH_ITEM + mIconName);
-                mOverlay = GregTech_API.sItemIcons.registerIcon(CORE.RES_PATH_ITEM + mIconName + "_OVERLAY");
-            }
-
-            @Override
-            public ResourceLocation getTextureFile() {
-                return TextureMap.locationItemsTexture;
-            }
-        }
-    }
+	public enum ItemIcons implements IIconContainer, Runnable {
+		VOID // The Empty Texture
+		, RENDERING_ERROR, WRENCH, MORTAR, CROWBAR, JACKHAMMER, WIRE_CUTTER, KNIFE, BUTCHERYKNIFE, SICKLE, SCOOP, GRAFTER, PLUNGER, ROLLING_PIN, HANDLE_SWORD, HANDLE_FILE, HANDLE_SAW, HANDLE_SCREWDRIVER, HANDLE_BUZZSAW, HANDLE_ELECTRIC_SCREWDRIVER, HANDLE_SOLDERING, POWER_UNIT_LV, POWER_UNIT_MV, POWER_UNIT_HV, DURABILITY_BAR_0, DURABILITY_BAR_1, DURABILITY_BAR_2, DURABILITY_BAR_3, DURABILITY_BAR_4, DURABILITY_BAR_5, DURABILITY_BAR_6, DURABILITY_BAR_7, DURABILITY_BAR_8, ENERGY_BAR_0, ENERGY_BAR_1, ENERGY_BAR_2, ENERGY_BAR_3, ENERGY_BAR_4, ENERGY_BAR_5, ENERGY_BAR_6, ENERGY_BAR_7, ENERGY_BAR_8,
+
+		SKOOKUMCHOOCHER, TURBINE_SMALL, TURBINE_LARGE, TURBINE_HUGE;
+
+		public static class CustomIcon implements IIconContainer, Runnable {
+			protected IIcon		mIcon, mOverlay;
+			protected String	mIconName;
+
+			public CustomIcon(final String aIconName) {
+				this.mIconName = aIconName;
+				GregTech_API.sGTItemIconload.add(this);
+			}
+
+			@Override
+			public IIcon getIcon() {
+				return this.mIcon;
+			}
+
+			@Override
+			public IIcon getOverlayIcon() {
+				return this.mOverlay;
+			}
+
+			@Override
+			public ResourceLocation getTextureFile() {
+				return TextureMap.locationItemsTexture;
+			}
+
+			@Override
+			public void run() {
+				this.mIcon = GregTech_API.sItemIcons.registerIcon(CORE.RES_PATH_ITEM + this.mIconName);
+				this.mOverlay = GregTech_API.sItemIcons.registerIcon(CORE.RES_PATH_ITEM + this.mIconName + "_OVERLAY");
+			}
+		}
+
+		public static final ITexture[]	ERROR_RENDERING	= new ITexture[] {
+				new GT_RenderedTexture(RENDERING_ERROR)
+		};
+
+		protected IIcon					mIcon, mOverlay;
+
+		private ItemIcons() {
+			GregTech_API.sGTItemIconload.add(this);
+		}
+
+		@Override
+		public IIcon getIcon() {
+			return this.mIcon;
+		}
+
+		@Override
+		public IIcon getOverlayIcon() {
+			return this.mOverlay;
+		}
+
+		@Override
+		public ResourceLocation getTextureFile() {
+			return TextureMap.locationItemsTexture;
+		}
+
+		@Override
+		public void run() {
+			this.mIcon = GregTech_API.sItemIcons.registerIcon(CORE.RES_PATH_ITEM + "iconsets/" + this);
+			this.mOverlay = GregTech_API.sItemIcons.registerIcon(CORE.RES_PATH_ITEM + "iconsets/" + this + "_OVERLAY");
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index ee5200a23f..52c34bf4f1 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -1,7 +1,6 @@
 package gtPlusPlus.xmod.gregtech.api.enums;
 
-import static gregtech.api.enums.GT_Values.W;
-
+import gregtech.api.enums.GT_Values;
 import gregtech.api.util.*;
 import gtPlusPlus.xmod.gregtech.api.interfaces.GregtechItemContainer;
 import net.minecraft.block.Block;
@@ -15,250 +14,272 @@ import net.minecraftforge.fluids.Fluid;
 public enum GregtechItemList implements GregtechItemContainer {
 
 	Energy_Buffer_CREATIVE,
-	
-	//Energy Buffers
+
+	// Energy Buffers
 	Energy_Buffer_1by1_ULV, Energy_Buffer_1by1_LV, Energy_Buffer_1by1_MV, Energy_Buffer_1by1_HV, Energy_Buffer_1by1_EV, Energy_Buffer_1by1_IV, Energy_Buffer_1by1_LuV, Energy_Buffer_1by1_ZPM, Energy_Buffer_1by1_UV, Energy_Buffer_1by1_MAX,
-	
-	//Cobble Generators
+
+	// Cobble Generators
 	Cobble_Generator_ULV, Cobble_Generator_LV, Cobble_Generator_MV, Cobble_Generator_HV, Cobble_Generator_EV, Cobble_Generator_IV, Cobble_Generator_LuV, Cobble_Generator_ZPM, Cobble_Generator_UV, Cobble_Generator_MAX,
-	
-	//The max Steam condenser
-	Condensor_MAX, 
-	
-	//Player owned Safes
+
+	// The max Steam condenser
+	Condensor_MAX,
+
+	// Player owned Safes
 	GT_Safe_ULV, GT_Safe_LV, GT_Safe_MV, GT_Safe_HV, GT_Safe_EV, GT_Safe_IV, GT_Safe_LuV, GT_Safe_ZPM, GT_Safe_UV, GT_Safe_MAX,
-	
-	//Rocket Engines
+
+	// Rocket Engines
 	Rocket_Engine_EV, Rocket_Engine_IV, Rocket_Engine_LuV,
-	
-	//IronBlastFurnace Machine_Bronze_BlastFurnace
+
+	// IronBlastFurnace Machine_Bronze_BlastFurnace
 	Machine_Iron_BlastFurnace, Casing_IronPlatedBricks,
-	
-	//Machine Casings
-	Casing_Shielding, 
-	
-	//Large Centrifuge
+
+	// Machine Casings
+	Casing_Shielding,
+
+	// Large Centrifuge
 	Industrial_Centrifuge, Casing_Centrifuge1,
-	
-	//Coke Oven
-	Industrial_CokeOven, Casing_CokeOven, Casing_CokeOven_Coil1, Casing_CokeOven_Coil2, 
-	
-	//Bending Maching // Plate Press // Press
-	Casing_MaterialPress, Industrial_PlatePress, 
-	
-	//Gregtech Machine Parts
-	Electric_Motor_LuV, Electric_Motor_ZPM, Electric_Motor_UV, Electric_Motor_MAX, 
-	Electric_Pump_LuV, Electric_Pump_ZPM, Electric_Pump_UV, Electric_Pump_MAX,
-	Conveyor_Module_LuV, Conveyor_Module_ZPM, Conveyor_Module_UV, Conveyor_Module_MAX, 
-	Electric_Piston_LuV, Electric_Piston_ZPM, Electric_Piston_UV, Electric_Piston_MAX,
-	Robot_Arm_LuV, Robot_Arm_ZPM, Robot_Arm_UV, Robot_Arm_MAX, 
-	Field_Generator_LuV, Field_Generator_ZPM, Field_Generator_UV, Field_Generator_MAX, 
-	Emitter_LuV, Emitter_ZPM, Emitter_UV, Emitter_MAX, 
-	Sensor_LuV, Sensor_ZPM, Sensor_UV, Sensor_MAX, 
-	
-	//Circuits
-	Circuit_Primitive, Circuit_Basic, Circuit_Good, Circuit_Advanced,	
-	Circuit_Data, Circuit_Elite, Circuit_Master, Tool_DataOrb, Circuit_Ultimate, Tool_DataStick, 
-	Circuit_IV, Circuit_LuV, Circuit_ZPM,
-	//Circuit Parts
-	Circuit_Board_IV, Circuit_Board_LuV, Circuit_Board_ZPM, 
-	Circuit_Parts_Crystal_Chip_IV, Circuit_Parts_Crystal_Chip_LuV, Circuit_Parts_Crystal_Chip_ZPM,
-	Circuit_Parts_IV, Circuit_Parts_LuV, Circuit_Parts_ZPM,
-	Circuit_Parts_Wiring_IV, Circuit_Parts_Wiring_LuV, Circuit_Parts_Wiring_ZPM, 
-	
-	//Unused Machine Casings
-	Casing_MacerationStack, Casing_MatterGen, Casing_MatterFab, Casing_U7, 
-	//Unused Machine Coils
+
+	// Coke Oven
+	Industrial_CokeOven, Casing_CokeOven, Casing_CokeOven_Coil1, Casing_CokeOven_Coil2,
+
+	// Bending Maching // Plate Press // Press
+	Casing_MaterialPress, Industrial_PlatePress,
+
+	// Gregtech Machine Parts
+	Electric_Motor_LuV, Electric_Motor_ZPM, Electric_Motor_UV, Electric_Motor_MAX, Electric_Pump_LuV, Electric_Pump_ZPM, Electric_Pump_UV, Electric_Pump_MAX, Conveyor_Module_LuV, Conveyor_Module_ZPM, Conveyor_Module_UV, Conveyor_Module_MAX, Electric_Piston_LuV, Electric_Piston_ZPM, Electric_Piston_UV, Electric_Piston_MAX, Robot_Arm_LuV, Robot_Arm_ZPM, Robot_Arm_UV, Robot_Arm_MAX, Field_Generator_LuV, Field_Generator_ZPM, Field_Generator_UV, Field_Generator_MAX, Emitter_LuV, Emitter_ZPM, Emitter_UV, Emitter_MAX, Sensor_LuV, Sensor_ZPM, Sensor_UV, Sensor_MAX,
+
+	// Circuits
+	Circuit_Primitive, Circuit_Basic, Circuit_Good, Circuit_Advanced, Circuit_Data, Circuit_Elite, Circuit_Master, Tool_DataOrb, Circuit_Ultimate, Tool_DataStick, Circuit_IV, Circuit_LuV, Circuit_ZPM,
+	// Circuit Parts
+	Circuit_Board_IV, Circuit_Board_LuV, Circuit_Board_ZPM, Circuit_Parts_Crystal_Chip_IV, Circuit_Parts_Crystal_Chip_LuV, Circuit_Parts_Crystal_Chip_ZPM, Circuit_Parts_IV, Circuit_Parts_LuV, Circuit_Parts_ZPM, Circuit_Parts_Wiring_IV, Circuit_Parts_Wiring_LuV, Circuit_Parts_Wiring_ZPM,
+
+	// Unused Machine Casings
+	Casing_MacerationStack, Casing_MatterGen, Casing_MatterFab, Casing_U7,
+	// Unused Machine Coils
 	Casing_Coil_U1, Casing_Coil_U2, Casing_Coil_BlastSmelter, Casing_BlastSmelter,
-	
-	//Windmill Shaft Shape for Extruder
-	Shape_Extruder_WindmillShaft, 
-	
-	//Batteries
+
+	// Windmill Shaft Shape for Extruder
+	Shape_Extruder_WindmillShaft,
+
+	// Batteries
 	Battery_RE_EV_Sodium, Battery_RE_EV_Cadmium, Battery_RE_EV_Lithium,
-	
-	//Industrial Electrolyzer
-	Casing_Electrolyzer, Industrial_Electrolyzer, 
-	
-	//Industrial Maceration Stack
-	Casing_WireFactory, Industrial_MacerationStack, 
-	
-	//Industrial Wire Factory
-	Industrial_WireFactory, 
-	
-	Industrial_MassFab, 
-	
-	//Solar Generators
-	GT_Solar_ULV, GT_Solar_LV, GT_Solar_MV,
-	GT_Solar_HV, GT_Solar_EV, GT_Solar_IV,
-	GT_Solar_LuV, GT_Solar_ZPM, GT_Solar_UV, GT_Solar_MAX, 
-	
-	
-	
-	//Cooked Raisin Toast for ImQ009
-	Food_Baked_Raisin_Bread, 
-	
-	//For sintering TODO
-	Industrial_AlloyBlastSmelter, 
-	
-	//Block that enables uplink to a superconductor network
-	SuperConductorInputNode, 
-	
-	//The two tiers of reactor casings
-	Casing_Reactor_I, Casing_Reactor_II, 
-	
-	//Power sub-station for mass storage. 3 hatches for input and output, whatever voltages you desire.
-	PowerSubStation, 
-	
-	//Chemical Dehydrators for nuclear fuels
+
+	// Industrial Electrolyzer
+	Casing_Electrolyzer, Industrial_Electrolyzer,
+
+	// Industrial Maceration Stack
+	Casing_WireFactory, Industrial_MacerationStack,
+
+	// Industrial Wire Factory
+	Industrial_WireFactory,
+
+	Industrial_MassFab,
+
+	// Solar Generators
+	GT_Solar_ULV, GT_Solar_LV, GT_Solar_MV, GT_Solar_HV, GT_Solar_EV, GT_Solar_IV, GT_Solar_LuV, GT_Solar_ZPM, GT_Solar_UV, GT_Solar_MAX,
+
+	// Cooked Raisin Toast for ImQ009
+	Food_Baked_Raisin_Bread,
+
+	// For sintering TODO
+	Industrial_AlloyBlastSmelter,
+
+	// Block that enables uplink to a superconductor network
+	SuperConductorInputNode,
+
+	// The two tiers of reactor casings
+	Casing_Reactor_I, Casing_Reactor_II,
+
+	// Power sub-station for mass storage. 3 hatches for input and output,
+	// whatever voltages you desire.
+	PowerSubStation,
+
+	// Chemical Dehydrators for nuclear fuels
 	GT_Dehydrator_EV, GT_Dehydrator_IV, GT_Dehydrator_LuV, GT_Dehydrator_ZPM,
-	
-	//Fluid Storage Tanks
-	GT_FluidTank_ULV, GT_FluidTank_LV, GT_FluidTank_MV, GT_FluidTank_HV, GT_FluidTank_EV,
-	GT_FluidTank_IV, GT_FluidTank_LuV, GT_FluidTank_ZPM, GT_FluidTank_UV, GT_FluidTank_MAX, 
-	
-	//Fluid Cells to regulate flows.
-	Fluid_Cell_1L, Fluid_Cell_16L, Fluid_Cell_36L, Fluid_Cell_144L, 
-	
-	//Multitank
-	Industrial_MultiTank, Industrial_MultiTankDense, Casing_MultitankExterior, 
-	
-	//Gt4 Workbenches
-	GT4_Workbench_Bronze, GT4_Workbench_Advanced, 
-	
-	//Geothermal Engines
-	Geothermal_Engine_EV, Geothermal_Engine_IV, Geothermal_Engine_LuV, 
-	
-	//Tesseracts
-	GT4_Tesseract_Generator, GT4_Tesseract_Terminal, 
-	
-	//Casings Tier 2 [17-32]
-	Casing_StructuralGlass, 
-	Casing_PlaceHolder1, Casing_PlaceHolder2, Casing_PlaceHolder3,
-	Casing_PlaceHolder4, Casing_PlaceHolder5, Casing_PlaceHolder6,
-	Casing_PlaceHolder7, Casing_PlaceHolder8, Casing_PlaceHolder9,
-	Casing_PlaceHolder10, Casing_PlaceHolder11, Casing_PlaceHolder12,
-	Casing_PlaceHolder13, Casing_PlaceHolder14, Casing_PlaceHolder15, 
-	
-	//LFTR
-	ThoriumReactor,
-	;
-
-	public static final GregtechItemList[]
-			DYE_ONLY_ITEMS = {
-		Energy_Buffer_1by1_EV, Energy_Buffer_1by1_EV };
-	private ItemStack mStack;
-	private boolean mHasNotBeenSet = true;
-
-	public static Fluid sOilExtraHeavy, sOilHeavy, sOilMedium, sOilLight, sNaturalGas;
+
+	// Fluid Storage Tanks
+	GT_FluidTank_ULV, GT_FluidTank_LV, GT_FluidTank_MV, GT_FluidTank_HV, GT_FluidTank_EV, GT_FluidTank_IV, GT_FluidTank_LuV, GT_FluidTank_ZPM, GT_FluidTank_UV, GT_FluidTank_MAX,
+
+	// Fluid Cells to regulate flows.
+	Fluid_Cell_1L, Fluid_Cell_16L, Fluid_Cell_36L, Fluid_Cell_144L,
+
+	// Multitank
+	Industrial_MultiTank, Industrial_MultiTankDense, Casing_MultitankExterior,
+
+	// Gt4 Workbenches
+	GT4_Workbench_Bronze, GT4_Workbench_Advanced,
+
+	// Geothermal Engines
+	Geothermal_Engine_EV, Geothermal_Engine_IV, Geothermal_Engine_LuV,
+
+	// Tesseracts
+	GT4_Tesseract_Generator, GT4_Tesseract_Terminal,
+
+	// Casings Tier 2 [17-32]
+	Casing_StructuralGlass, Casing_PlaceHolder1, Casing_PlaceHolder2, Casing_PlaceHolder3, Casing_PlaceHolder4, Casing_PlaceHolder5, Casing_PlaceHolder6, Casing_PlaceHolder7, Casing_PlaceHolder8, Casing_PlaceHolder9, Casing_PlaceHolder10, Casing_PlaceHolder11, Casing_PlaceHolder12, Casing_PlaceHolder13, Casing_PlaceHolder14, Casing_PlaceHolder15,
+
+	// LFTR
+	ThoriumReactor,;
+
+	public static final GregtechItemList[]	DYE_ONLY_ITEMS	= {
+			Energy_Buffer_1by1_EV, Energy_Buffer_1by1_EV
+	};
+	public static Fluid						sOilExtraHeavy, sOilHeavy, sOilMedium, sOilLight, sNaturalGas;
+	private ItemStack						mStack;
+
+	private boolean							mHasNotBeenSet	= true;
 
 	@Override
-	public GregtechItemList set(Item aItem) {
-		mHasNotBeenSet = false;
-		if (aItem == null) return this;
-		ItemStack aStack = new ItemStack(aItem, 1, 0);
-		mStack = GT_Utility.copyAmount(1, aStack);
-		return this;
+	public ItemStack get(final long aAmount, final Object... aReplacements) {
+		if (this.mHasNotBeenSet) {
+			throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!");
+		}
+		if (GT_Utility.isStackInvalid(this.mStack)) {
+			return GT_Utility.copyAmount(aAmount, aReplacements);
+		}
+		return GT_Utility.copyAmount(aAmount, GT_OreDictUnificator.get(this.mStack));
 	}
 
 	@Override
-	public GregtechItemList set(ItemStack aStack) {
-		mHasNotBeenSet = false;
-		mStack = GT_Utility.copyAmount(1, aStack);
-		return this;
+	public ItemStack getAlmostBroken(final long aAmount, final Object... aReplacements) {
+		if (this.mHasNotBeenSet) {
+			throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!");
+		}
+		if (GT_Utility.isStackInvalid(this.mStack)) {
+			return GT_Utility.copyAmount(aAmount, aReplacements);
+		}
+		return GT_Utility.copyAmountAndMetaData(aAmount, this.mStack.getMaxDamage() - 1,
+				GT_OreDictUnificator.get(this.mStack));
 	}
 
 	@Override
-	public Item getItem() {
-		if (mHasNotBeenSet) throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
-		if (GT_Utility.isStackInvalid(mStack)) return null;
-		return mStack.getItem();
+	public Block getBlock() {
+		if (this.mHasNotBeenSet) {
+			throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!");
+		}
+		return GT_Utility.getBlockFromStack(this.getItem());
 	}
 
 	@Override
-	public Block getBlock() {
-		if (mHasNotBeenSet) throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
-		return GT_Utility.getBlockFromStack(getItem());
+	public Item getItem() {
+		if (this.mHasNotBeenSet) {
+			throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!");
+		}
+		if (GT_Utility.isStackInvalid(this.mStack)) {
+			return null;
+		}
+		return this.mStack.getItem();
 	}
 
 	@Override
-	public final boolean hasBeenSet() {
-		return !mHasNotBeenSet;
+	public ItemStack getUndamaged(final long aAmount, final Object... aReplacements) {
+		if (this.mHasNotBeenSet) {
+			throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!");
+		}
+		if (GT_Utility.isStackInvalid(this.mStack)) {
+			return GT_Utility.copyAmount(aAmount, aReplacements);
+		}
+		return GT_Utility.copyAmountAndMetaData(aAmount, 0, GT_OreDictUnificator.get(this.mStack));
 	}
 
 	@Override
-	public boolean isStackEqual(Object aStack) {
-		return isStackEqual(aStack, false, false);
+	public ItemStack getWildcard(final long aAmount, final Object... aReplacements) {
+		if (this.mHasNotBeenSet) {
+			throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!");
+		}
+		if (GT_Utility.isStackInvalid(this.mStack)) {
+			return GT_Utility.copyAmount(aAmount, aReplacements);
+		}
+		return GT_Utility.copyAmountAndMetaData(aAmount, GT_Values.W, GT_OreDictUnificator.get(this.mStack));
 	}
 
 	@Override
-	public boolean isStackEqual(Object aStack, boolean aWildcard, boolean aIgnoreNBT) {
-		if (GT_Utility.isStackInvalid(aStack)) return false;
-		return GT_Utility.areUnificationsEqual((ItemStack)aStack, aWildcard?getWildcard(1):get(1), aIgnoreNBT);
+	public ItemStack getWithCharge(final long aAmount, final int aEnergy, final Object... aReplacements) {
+		final ItemStack rStack = this.get(1, aReplacements);
+		if (GT_Utility.isStackInvalid(rStack)) {
+			return null;
+		}
+		GT_ModHandler.chargeElectricItem(rStack, aEnergy, Integer.MAX_VALUE, true, false);
+		return GT_Utility.copyAmount(aAmount, rStack);
 	}
 
 	@Override
-	public ItemStack get(long aAmount, Object... aReplacements) {
-		if (mHasNotBeenSet) throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
-		if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements);
-		return GT_Utility.copyAmount(aAmount, GT_OreDictUnificator.get(mStack));
+	public ItemStack getWithDamage(final long aAmount, final long aMetaValue, final Object... aReplacements) {
+		if (this.mHasNotBeenSet) {
+			throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!");
+		}
+		if (GT_Utility.isStackInvalid(this.mStack)) {
+			return GT_Utility.copyAmount(aAmount, aReplacements);
+		}
+		return GT_Utility.copyAmountAndMetaData(aAmount, aMetaValue, GT_OreDictUnificator.get(this.mStack));
 	}
 
 	@Override
-	public ItemStack getWildcard(long aAmount, Object... aReplacements) {
-		if (mHasNotBeenSet) throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
-		if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements);
-		return GT_Utility.copyAmountAndMetaData(aAmount, W, GT_OreDictUnificator.get(mStack));
+	public ItemStack getWithName(final long aAmount, final String aDisplayName, final Object... aReplacements) {
+		final ItemStack rStack = this.get(1, aReplacements);
+		if (GT_Utility.isStackInvalid(rStack)) {
+			return null;
+		}
+		rStack.setStackDisplayName(aDisplayName);
+		return GT_Utility.copyAmount(aAmount, rStack);
 	}
 
 	@Override
-	public ItemStack getUndamaged(long aAmount, Object... aReplacements) {
-		if (mHasNotBeenSet) throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
-		if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements);
-		return GT_Utility.copyAmountAndMetaData(aAmount, 0, GT_OreDictUnificator.get(mStack));
+	public final boolean hasBeenSet() {
+		return !this.mHasNotBeenSet;
 	}
 
 	@Override
-	public ItemStack getAlmostBroken(long aAmount, Object... aReplacements) {
-		if (mHasNotBeenSet) throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
-		if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements);
-		return GT_Utility.copyAmountAndMetaData(aAmount, mStack.getMaxDamage()-1, GT_OreDictUnificator.get(mStack));
+	public boolean isStackEqual(final Object aStack) {
+		return this.isStackEqual(aStack, false, false);
 	}
 
 	@Override
-	public ItemStack getWithName(long aAmount, String aDisplayName, Object... aReplacements) {
-		ItemStack rStack = get(1, aReplacements);
-		if (GT_Utility.isStackInvalid(rStack)) return null;
-		rStack.setStackDisplayName(aDisplayName);
-		return GT_Utility.copyAmount(aAmount, rStack);
+	public boolean isStackEqual(final Object aStack, final boolean aWildcard, final boolean aIgnoreNBT) {
+		if (GT_Utility.isStackInvalid(aStack)) {
+			return false;
+		}
+		return GT_Utility.areUnificationsEqual((ItemStack) aStack, aWildcard ? this.getWildcard(1) : this.get(1),
+				aIgnoreNBT);
 	}
 
 	@Override
-	public ItemStack getWithCharge(long aAmount, int aEnergy, Object... aReplacements) {
-		ItemStack rStack = get(1, aReplacements);
-		if (GT_Utility.isStackInvalid(rStack)) return null;
-		GT_ModHandler.chargeElectricItem(rStack, aEnergy, Integer.MAX_VALUE, true, false);
-		return GT_Utility.copyAmount(aAmount, rStack);
+	public GregtechItemList registerOre(final Object... aOreNames) {
+		if (this.mHasNotBeenSet) {
+			throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!");
+		}
+		for (final Object tOreName : aOreNames) {
+			GT_OreDictUnificator.registerOre(tOreName, this.get(1));
+		}
+		return this;
 	}
 
 	@Override
-	public ItemStack getWithDamage(long aAmount, long aMetaValue, Object... aReplacements) {
-		if (mHasNotBeenSet) throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
-		if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements);
-		return GT_Utility.copyAmountAndMetaData(aAmount, aMetaValue, GT_OreDictUnificator.get(mStack));
+	public GregtechItemList registerWildcardAsOre(final Object... aOreNames) {
+		if (this.mHasNotBeenSet) {
+			throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!");
+		}
+		for (final Object tOreName : aOreNames) {
+			GT_OreDictUnificator.registerOre(tOreName, this.getWildcard(1));
+		}
+		return this;
 	}
 
 	@Override
-	public GregtechItemList registerOre(Object... aOreNames) {
-		if (mHasNotBeenSet) throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
-		for (Object tOreName : aOreNames) GT_OreDictUnificator.registerOre(tOreName, get(1));
+	public GregtechItemList set(final Item aItem) {
+		this.mHasNotBeenSet = false;
+		if (aItem == null) {
+			return this;
+		}
+		final ItemStack aStack = new ItemStack(aItem, 1, 0);
+		this.mStack = GT_Utility.copyAmount(1, aStack);
 		return this;
 	}
 
 	@Override
-	public GregtechItemList registerWildcardAsOre(Object... aOreNames) {
-		if (mHasNotBeenSet) throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
-		for (Object tOreName : aOreNames) GT_OreDictUnificator.registerOre(tOreName, getWildcard(1));
+	public GregtechItemList set(final ItemStack aStack) {
+		this.mHasNotBeenSet = false;
+		this.mStack = GT_Utility.copyAmount(1, aStack);
 		return this;
 	}
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOreDictNames.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOreDictNames.java
index dcb075349d..d573144fca 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOreDictNames.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOreDictNames.java
@@ -12,28 +12,24 @@ package gtPlusPlus.xmod.gregtech.api.enums;
 * Master (Tier 7) : Energy Flow Circuit and Lapotron Crystal
 * Ultimate (Tier 8) : Data Orb and Lapotronic Energy Orb
 * Infinite (Cheaty)
-* 
+*
 Circuits
-	Circuit_Primitive, Circuit_Basic, Circuit_Good, Circuit_Advanced,	
-	Circuit_Data, Circuit_Elite, Circuit_Master, Tool_DataOrb, Circuit_Ultimate, Tool_DataStick, 
+	Circuit_Primitive, Circuit_Basic, Circuit_Good, Circuit_Advanced,
+	Circuit_Data, Circuit_Elite, Circuit_Master, Tool_DataOrb, Circuit_Ultimate, Tool_DataStick,
 	Circuit_IV, Circuit_LuV, Circuit_ZPM,
 Circuit Parts
-	Circuit_Board_IV, Circuit_Board_LuV, Circuit_Board_ZPM, 
+	Circuit_Board_IV, Circuit_Board_LuV, Circuit_Board_ZPM,
 	Circuit_Parts_Crystal_Chip_IV, Circuit_Parts_Crystal_Chip_LuV, Circuit_Parts_Crystal_Chip_ZPM,
 	Circuit_Parts_IV, Circuit_Parts_LuV, Circuit_Parts_ZPM,
 	Circuit_Parts_Wiring_IV, Circuit_Parts_Wiring_LuV, Circuit_Parts_Wiring_ZPM;
 */
 public enum GregtechOreDictNames {
-	buffer_core, itemGregConduit, Circuit_IV, Circuit_LuV, Circuit_ZPM,
-	Circuit_Board_IV, Circuit_Board_LuV, Circuit_Board_ZPM, 
-	Circuit_Parts_Crystal_Chip_IV, Circuit_Parts_Crystal_Chip_LuV, Circuit_Parts_Crystal_Chip_ZPM,
-	Circuit_Parts_IV, Circuit_Parts_LuV, Circuit_Parts_ZPM,
-	Circuit_Parts_Wiring_IV, Circuit_Parts_Wiring_LuV, Circuit_Parts_Wiring_ZPM;
+	buffer_core, itemGregConduit, Circuit_IV, Circuit_LuV, Circuit_ZPM, Circuit_Board_IV, Circuit_Board_LuV, Circuit_Board_ZPM, Circuit_Parts_Crystal_Chip_IV, Circuit_Parts_Crystal_Chip_LuV, Circuit_Parts_Crystal_Chip_ZPM, Circuit_Parts_IV, Circuit_Parts_LuV, Circuit_Parts_ZPM, Circuit_Parts_Wiring_IV, Circuit_Parts_Wiring_LuV, Circuit_Parts_Wiring_ZPM;
 
 	public String unlocalisedName;
 
 	private void ModObject() {
-		unlocalisedName = name();
+		this.unlocalisedName = this.name();
 	}
 
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java
index 1c8ae2bc3c..3530b3d084 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java
@@ -1,10 +1,5 @@
 package gtPlusPlus.xmod.gregtech.api.enums;
 
-import static gregtech.api.enums.GT_Values.B;
-import static gregtech.api.enums.GT_Values.D2;
-import static gregtech.api.enums.GT_Values.M;
-import static gtPlusPlus.core.util.Utils.getTcAspectStack;
-
 import java.util.*;
 
 import gregtech.api.enums.*;
@@ -14,6 +9,7 @@ import gregtech.api.objects.GT_FluidStack;
 import gregtech.api.objects.MaterialStack;
 import gregtech.api.util.*;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
 import gtPlusPlus.xmod.gregtech.api.objects.GregtechItemData;
 import gtPlusPlus.xmod.gregtech.api.objects.GregtechMaterialStack;
@@ -23,722 +19,1177 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 
 public enum GregtechOrePrefixes {
-	/* Electric Components.
+	/*
+	 * Electric Components.
 	 *
-	 * usual Materials for this are:
-	 * Primitive (Tier 1)
-	 * Basic (Tier 2) as used by UE as well : IC2 Circuit and RE-Battery
-	 * Good (Tier 3)
-	 * Advanced (Tier 4) as used by UE as well : Advanced Circuit, Advanced Battery and Lithium Battery
-	 * Data (Tier 5) : Data Storage Circuit
-	 * Elite (Tier 6) as used by UE as well : Energy Crystal and Data Control Circuit
-	 * Master (Tier 7) : Energy Flow Circuit and Lapotron Crystal
-	 * Ultimate (Tier 8) : Data Orb and Lapotronic Energy Orb
-	 * Infinite (Cheaty)
-	 */
-	ingotHot("Hot Ingots", "Hot ", " Ingot", true, true, false, false, false, false, false, true, false, false, B[1], M * 1, 16, 12), // A hot Ingot, which has to be cooled down by a Vacuum Freezer.
-	ingot("Ingots", "", " Ingot", true, true, false, false, false, false, false, true, false, false, B[1], M * 1, 64, 11), // A regular Ingot. Introduced by Eloraam
-	dustTiny("Tiny Dusts", "Tiny Pile of ", " Dust", true, true, false, false, false, false, false, true, false, false, B[0] | B[1] | B[2] | B[3], M / 9, 64, 0), // 1/9th of a Dust.
-	dustSmall("Small Dusts", "Small Pile of ", " Dust", true, true, false, false, false, false, false, true, false, false, B[0] | B[1] | B[2] | B[3], M / 4, 64, 1), // 1/4th of a Dust.
-	dustImpure("Impure Dusts", "Impure Pile of ", " Dust", true, true, false, false, false, false, false, true, false, true, B[3], M * 1, 64, 3), // Dust with impurities. 1 Unit of Main Material and 1/9 - 1/4 Unit of secondary Material
-	dustRefined("Refined Dusts", "Refined Pile of ", " Dust", true, true, false, false, false, false, false, true, false, true, B[3], M * 1, 64, 2),
-	dustPure("Purified Dusts", "Purified Pile of ", " Dust", true, true, false, false, false, false, false, true, false, true, B[3], M * 1, 64, 4),
-	dust("Dusts", "", " Dust", true, true, false, false, false, false, false, true, false, false, B[0] | B[1] | B[2] | B[3], M * 1, 64, 2), // Pure Dust worth of one Ingot or Gem. Introduced by Alblaka.
-	nugget("Nuggets", "", " Nugget", true, true, false, false, false, false, false, true, false, false, B[1], M / 9, 64, 9), // A Nugget. Introduced by Eloraam
-	plate("Plates", "", " Plate", true, true, false, false, false, false, true, true, false, false, B[1] | B[2], M * 1, 64, 17), // Regular Plate made of one Ingot/Dust. Introduced by Calclavia
-	block("Storage Blocks", "Block of ", "", true, true, false, false, false, true, true, false, false, false, 0, M * 9, 64, 71), // Storage Block consisting out of 9 Ingots/Gems/Dusts. Introduced by CovertJaguar
-	gem("Gemstones", "", "", true, true, true, false, false, false, true, true, false, false, B[2], M * 1, 64, 8), // A regular Gem worth one Dust. Introduced by Eloraam
-	gemChipped("Chipped Gemstones", "Chipped ", "", true, true, true, false, false, false, true, true, false, false, B[2], M / 4, 64, 59), // A regular Gem worth one small Dust. Introduced by TerraFirmaCraft
-	gemFlawed("Flawed Gemstones", "Flawed ", "", true, true, true, false, false, false, true, true, false, false, B[2], M / 2, 64, 60), // A regular Gem worth two small Dusts. Introduced by TerraFirmaCraft
-	gemFlawless("Flawless Gemstones", "Flawless ", "", true, true, true, false, false, false, true, true, false, false, B[2], M * 2, 32, 61), // A regular Gem worth two Dusts. Introduced by TerraFirmaCraft
-	gemExquisite("Exquisite Gemstones", "Exquisite ", "", true, true, true, false, false, false, true, true, false, false, B[2], M * 4, 16, 62), // A regular Gem worth four Dusts. Introduced by TerraFirmaCraft
-	stick("Sticks/Rods", "", " Rod", true, true, false, false, false, false, true, true, false, false, B[1] | B[2], M / 2, 64, 23), // Stick made of half an Ingot. Introduced by Eloraam
-	type2("16x Wires", "16x ", " Wire", true, true, false, false, false, false, true, false, false, false, 0, M * 8, 64, -1),
-	
-	 toolSkookumChoocher("Skookum Choocher", "", " Skookum Choocher", true, true, false, false, false, false, true, true, false, false, B[6], M * 6, 16, 37), // consisting out of 6 Ingots.
-
-	
-
-	batterySingleuse("Single Use Batteries", "", "", false, true, false, false, false, false, false, false, false, false, 0, -1, 64, -1),
-	battery("Reusable Batteries", "", "", false, true, false, false, false, false, false, false, false, false, 0, -1, 64, -1), // Introduced by Calclavia
-	circuit("Circuits", "", "", true, true, false, false, false, false, false, false, false, false, 0, -1, 64, -1), // Introduced by Calclavia
-	chipset("Chipsets", "", "", true, true, false, false, false, false, false, false, false, false, 0, -1, 64, -1), // Introduced by Buildcraft
-	computer("Computers", "", "", true, true, false, false, true, false, false, false, false, false, 0, -1, 64, -1); // A whole Computer. "computerMaster" = ComputerCube
-
-	public static volatile int VERSION = 508;
-
-    static {
-    	
-        ingotHot.mHeatDamage = 3.0F;
-        
-    }
-
-	public final ArrayList<ItemStack> mPrefixedItems = new ArrayList<ItemStack>();
-	public final short mTextureIndex;
-	public final String mRegularLocalName, mLocalizedMaterialPre, mLocalizedMaterialPost;
-	public final boolean mIsUsedForOreProcessing, mIsEnchantable, mIsUnificatable, mIsMaterialBased, mIsSelfReferencing, mIsContainer, mDontUnificateActively, mIsUsedForBlocks, mAllowNormalRecycling, mGenerateDefaultItem;
-	public final List<TC_AspectStack> mAspects = new ArrayList<TC_AspectStack>();
-	public final Collection<GregtechOrePrefixes> mFamiliarPrefixes = new HashSet<GregtechOrePrefixes>();
-	/**
-	 * Used to determine the amount of Material this Prefix contains.
-	 * Multiply or Divide GregTech_API.MATERIAL_UNIT to get the Amounts in comparision to one Ingot.
-	 * 0 = Null
-	 * Negative = Undefined Amount
+	 * usual Materials for this are: Primitive (Tier 1) Basic (Tier 2) as used
+	 * by UE as well : IC2 Circuit and RE-Battery Good (Tier 3) Advanced (Tier
+	 * 4) as used by UE as well : Advanced Circuit, Advanced Battery and Lithium
+	 * Battery Data (Tier 5) : Data Storage Circuit Elite (Tier 6) as used by UE
+	 * as well : Energy Crystal and Data Control Circuit Master (Tier 7) :
+	 * Energy Flow Circuit and Lapotron Crystal Ultimate (Tier 8) : Data Orb and
+	 * Lapotronic Energy Orb Infinite (Cheaty)
 	 */
-	public final long mMaterialAmount;
-	private final Collection<Materials> mNotGeneratedItems = new HashSet<Materials>(), mIgnoredMaterials = new HashSet<Materials>(), mGeneratedItems = new HashSet<Materials>();
-	private final ArrayList<Interface_OreRecipeRegistrator> mOreProcessing = new ArrayList<Interface_OreRecipeRegistrator>();
-	private final ArrayList<Interface_OreRecipeRegistrator> mOreProcessingFake = new ArrayList<Interface_OreRecipeRegistrator>();
-	public ItemStack mContainerItem = null;
-	public ICondition<ISubTagContainer> mCondition = null;
-	public byte mDefaultStackSize = 64;
-	public GregtechMaterialStack mSecondaryMaterial = null;
-	public GregtechOrePrefixes mPrefixInto = this;
-	public float mHeatDamage = 0.0F; // Negative for Frost Damage
-	/**
-	 * Yes this Value can be changed to add Bits for the MetaGenerated-Item-Check.
-	 */
-	public int mMaterialGenerationBits = 0;
-	private GregtechOrePrefixes(String aRegularLocalName, String aLocalizedMaterialPre, String aLocalizedMaterialPost, boolean aIsUnificatable, boolean aIsMaterialBased, boolean aIsSelfReferencing, boolean aIsContainer, boolean aDontUnifi