Revert "$ Cleaned up the entire project."

This reverts commit 0669f5eb9d5029a8b94ec552171b0837605f7747.

# Conflicts:
#	src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java
#	src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MassFabricator.java

Revert "% Cleaned up Imports."

This reverts commit 3654052fb63a571c5eaca7f20714b87c17f7e966.

57 files changed, 4157 insertions, 4394 deletions

diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 79b813c745..2fa0d2c698 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -1,11 +1,14 @@
 package gtPlusPlus.core.item;
-
-import cpw.mods.fml.common.registry.GameRegistry;
+import static gtPlusPlus.core.creative.AddToCreativeTab.tabMachines;
+import static gtPlusPlus.core.creative.AddToCreativeTab.tabMisc;
+import static gtPlusPlus.core.lib.CORE.LOAD_ALL_CONTENT;
 import gregtech.api.enums.Materials;
 import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.core.common.compat.COMPAT_Baubles;
 import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.item.base.*;
+import gtPlusPlus.core.item.base.BaseEuItem;
+import gtPlusPlus.core.item.base.BaseItemBackpack;
+import gtPlusPlus.core.item.base.CoreItem;
 import gtPlusPlus.core.item.base.dusts.decimal.BaseItemCentidust;
 import gtPlusPlus.core.item.base.dusts.decimal.BaseItemDecidust;
 import gtPlusPlus.core.item.base.foods.BaseItemFood;
@@ -13,390 +16,350 @@ import gtPlusPlus.core.item.base.foods.BaseItemHotFood;
 import gtPlusPlus.core.item.base.ingots.BaseItemIngot;
 import gtPlusPlus.core.item.base.plates.BaseItemPlate;
 import gtPlusPlus.core.item.effects.RarityUncommon;
-import gtPlusPlus.core.item.general.*;
+import gtPlusPlus.core.item.general.BufferCore;
+import gtPlusPlus.core.item.general.ItemBlueprint;
+import gtPlusPlus.core.item.general.RF2EU_Battery;
 import gtPlusPlus.core.item.general.fuelrods.FuelRod_Base;
 import gtPlusPlus.core.item.init.ItemsFoods;
 import gtPlusPlus.core.item.tool.misc.SandstoneHammer;
-import gtPlusPlus.core.item.tool.staballoy.*;
+import gtPlusPlus.core.item.tool.staballoy.MultiPickaxeBase;
+import gtPlusPlus.core.item.tool.staballoy.MultiSpadeBase;
+import gtPlusPlus.core.item.tool.staballoy.StaballoyAxe;
+import gtPlusPlus.core.item.tool.staballoy.StaballoyPickaxe;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.CORE.configSwitches;
 import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.core.material.*;
+import gtPlusPlus.core.material.ALLOY;
+import gtPlusPlus.core.material.ELEMENT;
+import gtPlusPlus.core.material.MaterialGenerator;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.debug.DEBUG_INIT;
 import gtPlusPlus.core.util.item.ItemUtils;
-import net.minecraft.item.*;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.Item;
 import net.minecraft.item.Item.ToolMaterial;
+import net.minecraft.item.ItemFood;
+import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.common.util.EnumHelper;
-
+import cpw.mods.fml.common.registry.GameRegistry;
 public final class ModItems {
 
-	public static ToolMaterial		STABALLOY	= EnumHelper.addToolMaterial("Staballoy", 3, 2500, 7, 1.0F, 18);
-
-	public static Item				AAA_Broken;
-
-	public static Item				itemDebugShapeSpawner;
-
-	public static Item				itemBaseSpawnEgg;
-
-	// EnderIO
-	public static Item				itemPlateSoularium;
-	public static Item				itemPlateRedstoneAlloy;
-	public static Item				itemPlateElectricalSteel;
-	public static Item				itemPlatePulsatingIron;
-	public static Item				itemPlateEnergeticAlloy;
-	public static Item				itemPlateVibrantAlloy;
-	public static Item				itemPlateConductiveIron;
-	public static Item				itemPlateDarkSteel;
-	// Big Reactors
-	public static Item				itemPlateBlutonium;
-	public static Item				itemPlateCyanite;
-	public static Item				itemPlateLudicrite;
-	// Thaumcraft
-	public static Item				itemPlateVoidMetal;
-	// Pneumaticraft
-	public static Item				itemPlateCompressedIron;
-	// SimplyJetpacks
-	public static Item				itemPlateEnrichedSoularium;
-	// rfTools
-	public static Item				itemPlateDimensionShard;
-	// Staballoy
-	public static Item				itemStaballoyPickaxe;
-	public static Item				itemStaballoyAxe;
-	// Tools
-	public static Item				itemSandstoneHammer;
-	// Machine Related
-	public static Item				itemBufferCore0;
-	// Material related
-	public static Item				itemStickyRubber;
-	public static Item				itemIngotBatteryAlloy;
-	public static Item				itemPlateBatteryAlloy;
-	public static Item				itemHeliumBlob;
-	public static Item				itemPLACEHOLDER_Circuit;
-
-	public static Item				FuelRod_Empty;
-	public static Item				FuelRod_Thorium;
-	public static Item				FuelRod_Uranium;
-	public static Item				FuelRod_Plutonium;
-
-	public static Item				itemBedLocator_Base;
-	public static Item				itemBaseItemWithCharge;
-
-	public static Item				itemIngotRaisinBread;
-	public static Item				itemHotIngotRaisinBread;
-
-	public static ItemFood			itemFoodRaisinToast;
-	public static BaseItemHotFood	itemHotFoodRaisinToast;
-	public static BaseItemFood		itemFoodCurriedSausages;
-	public static BaseItemHotFood	itemHotFoodCurriedSausages;
-
-	public static Item				RfEuBattery;
-	public static Item				itemPersonalCloakingDevice;
-	public static Item				itemPersonalCloakingDeviceCharged;
-	public static Item				itemPersonalHealingDevice;
-
-	public static MultiPickaxeBase	MP_GTMATERIAL;
-	public static MultiSpadeBase	MS_GTMATERIAL;
-
-	public static BaseItemDecidust	itemBaseDecidust;
-	public static BaseItemCentidust	itemBaseCentidust;
-
-	public static ItemStack			FluidCell;
-
-	public static BaseItemBackpack	backpack_Red;
-	public static BaseItemBackpack	backpack_Green;
-	public static BaseItemBackpack	backpack_Blue;
-	public static BaseItemBackpack	backpack_Yellow;
-	public static BaseItemBackpack	backpack_Purple;
-	public static BaseItemBackpack	backpack_Cyan;
-	public static BaseItemBackpack	backpack_Maroon;
-	public static BaseItemBackpack	backpack_Olive;
-	public static BaseItemBackpack	backpack_DarkGreen;
-	public static BaseItemBackpack	backpack_DarkPurple;
-	public static BaseItemBackpack	backpack_Teal;
-	public static BaseItemBackpack	backpack_Navy;
-	public static BaseItemBackpack	backpack_Silver;
-	public static BaseItemBackpack	backpack_Gray;
-	public static BaseItemBackpack	backpack_Black;
-	public static BaseItemBackpack	backpack_White;
-
-	public static ItemBlueprint		itemBlueprintBase;
-
-	public static Item				dustLithiumCarbonate;
-	public static Item				dustLithiumHydroxide;
-	public static Item				dustLithiumPeroxide;
-	public static Item				dustLithiumFluoride;
-
-	public static Item				dustUraniumTetraFluoride;
-	public static Item				dustUraniumHexaFluoride;
-
-	public static Item				dustBerylliumFluoride;
-
-	public static Item				dustQuicklime;
-	public static Item				dustCalciumHydroxide;
-	public static Item				dustCalciumCarbonate;
-	public static Item				dust2LiOH_CaCO3;
-	public static Item				dustLi2BeF4;
-
-	public static BaseEuItem		metaItem2;
-
-	// @SuppressWarnings("unused")
+	public static ToolMaterial STABALLOY = EnumHelper.addToolMaterial("Staballoy", 3, 2500, 7, 1.0F, 18);
+
+	public static Item AAA_Broken;
+
+	public static Item itemDebugShapeSpawner;
+
+	public static Item itemBaseSpawnEgg;
+
+	//EnderIO
+	public static Item itemPlateSoularium;
+	public static Item itemPlateRedstoneAlloy;
+	public static Item itemPlateElectricalSteel;
+	public static Item itemPlatePulsatingIron;
+	public static Item itemPlateEnergeticAlloy;
+	public static Item itemPlateVibrantAlloy;
+	public static Item itemPlateConductiveIron;
+	public static Item itemPlateDarkSteel;
+	//Big Reactors
+	public static Item itemPlateBlutonium;
+	public static Item itemPlateCyanite;
+	public static Item itemPlateLudicrite;
+	//Thaumcraft
+	public static Item itemPlateVoidMetal;
+	//Pneumaticraft
+	public static Item itemPlateCompressedIron;
+	//SimplyJetpacks
+	public static Item itemPlateEnrichedSoularium;
+	//rfTools
+	public static Item itemPlateDimensionShard;
+	//Staballoy
+	public static Item itemStaballoyPickaxe;
+	public static Item itemStaballoyAxe;
+	//Tools
+	public static Item itemSandstoneHammer;
+	//Machine Related
+	public static Item itemBufferCore0;
+	//Material related
+	public static Item itemStickyRubber;
+	public static Item itemIngotBatteryAlloy;
+	public static Item itemPlateBatteryAlloy;
+	public static Item itemHeliumBlob;
+	public static Item itemPLACEHOLDER_Circuit;
+
+	public static Item FuelRod_Empty;
+	public static Item FuelRod_Thorium;
+	public static Item FuelRod_Uranium;
+	public static Item FuelRod_Plutonium;
+
+	public static Item itemBedLocator_Base;
+	public static Item itemBaseItemWithCharge;
+
+	public static Item itemIngotRaisinBread;
+	public static Item itemHotIngotRaisinBread;
+
+	public static ItemFood itemFoodRaisinToast;
+	public static BaseItemHotFood itemHotFoodRaisinToast;
+	public static BaseItemFood itemFoodCurriedSausages;
+	public static BaseItemHotFood itemHotFoodCurriedSausages;
+
+	public static Item RfEuBattery;
+	public static Item itemPersonalCloakingDevice;
+	public static Item itemPersonalCloakingDeviceCharged;
+	public static Item itemPersonalHealingDevice;
+
+	public static MultiPickaxeBase MP_GTMATERIAL;
+	public static MultiSpadeBase MS_GTMATERIAL;
+	
+	public static BaseItemDecidust itemBaseDecidust;
+	public static BaseItemCentidust itemBaseCentidust;
+
+	public static ItemStack FluidCell;
+
+	public static BaseItemBackpack backpack_Red;
+	public static BaseItemBackpack backpack_Green;
+	public static BaseItemBackpack backpack_Blue;
+	public static BaseItemBackpack backpack_Yellow;
+	public static BaseItemBackpack backpack_Purple;
+	public static BaseItemBackpack backpack_Cyan;
+	public static BaseItemBackpack backpack_Maroon;
+	public static BaseItemBackpack backpack_Olive;
+	public static BaseItemBackpack backpack_DarkGreen;
+	public static BaseItemBackpack backpack_DarkPurple;
+	public static BaseItemBackpack backpack_Teal;
+	public static BaseItemBackpack backpack_Navy;
+	public static BaseItemBackpack backpack_Silver;
+	public static BaseItemBackpack backpack_Gray;
+	public static BaseItemBackpack backpack_Black;
+	public static BaseItemBackpack backpack_White;
+
+	public static ItemBlueprint itemBlueprintBase;
+
+	public static Item dustLithiumCarbonate;
+	public static Item dustLithiumHydroxide;
+	public static Item dustLithiumPeroxide;
+	public static Item dustLithiumFluoride;
+
+	public static Item dustUraniumTetraFluoride;
+	public static Item dustUraniumHexaFluoride;
+
+	public static Item dustBerylliumFluoride;
+
+	public static Item dustQuicklime;
+	public static Item dustCalciumHydroxide;
+	public static Item dustCalciumCarbonate;
+	public static Item dust2LiOH_CaCO3;
+	public static Item dustLi2BeF4;
+	
+	public static BaseEuItem metaItem2;
+
+
+	//@SuppressWarnings("unused")
 	@SuppressWarnings("unused")
-	public static final void init() {
+	public static final void init(){
 
-		ModItems.AAA_Broken = new BaseItemIngot("AAA_Broken", "Errors - Tell Alkalus",
-				Utils.rgbtoHexValue(128, 128, 128), 0);
+		AAA_Broken = new BaseItemIngot("AAA_Broken", "Errors - Tell Alkalus", Utils.rgbtoHexValue(128, 128, 128), 0);
 
-		// Debug Loading
-		if (CORE.DEBUG) {
+		//Debug Loading
+		if (CORE.DEBUG){
 			DEBUG_INIT.registerItems();
-		}
-
-		// Some Simple forms of materials
-		ModItems.itemStickyRubber = new Item().setUnlocalizedName("itemStickyRubber")
-				.setCreativeTab(AddToCreativeTab.tabMachines).setTextureName(CORE.MODID + ":itemStickyRubber");
-		GameRegistry.registerItem(ModItems.itemStickyRubber, "itemStickyRubber");
-		GT_OreDictUnificator.registerOre("ingotRubber", ItemUtils.getItemStack(CORE.MODID + ":itemStickyRubber", 1));
-
-		ModItems.itemHeliumBlob = new CoreItem("itemHeliumBlob", AddToCreativeTab.tabMisc)
-				.setTextureName(CORE.MODID + ":itemHeliumBlob");
+		}		
+		
+		
+		//Some Simple forms of materials
+		itemStickyRubber = new Item().setUnlocalizedName("itemStickyRubber").setCreativeTab(tabMachines).setTextureName(CORE.MODID + ":itemStickyRubber");
+		GameRegistry.registerItem(itemStickyRubber, "itemStickyRubber");
+		GT_OreDictUnificator.registerOre("ingotRubber", ItemUtils.getItemStack(CORE.MODID+":itemStickyRubber", 1));
+
+		itemHeliumBlob = new CoreItem("itemHeliumBlob", tabMisc).setTextureName(CORE.MODID + ":itemHeliumBlob");
 		GT_OreDictUnificator.registerOre("dustHydrogen", new ItemStack(ModItems.itemHeliumBlob));
-		// GameRegistry.registerItem(itemHeliumBlob, "itemHeliumBlob");
-
-		// Make some backpacks
-		// Primary colours
-		ModItems.backpack_Red = new BaseItemBackpack("backpackRed", Utils.rgbtoHexValue(200, 0, 0));
-		ModItems.backpack_Green = new BaseItemBackpack("backpackGreen", Utils.rgbtoHexValue(0, 200, 0));
-		ModItems.backpack_Blue = new BaseItemBackpack("backpackBlue", Utils.rgbtoHexValue(0, 0, 200));
-		// Secondary Colours
-		ModItems.backpack_Yellow = new BaseItemBackpack("backpackYellow", Utils.rgbtoHexValue(200, 200, 0));
-		ModItems.backpack_Purple = new BaseItemBackpack("backpackPurple", Utils.rgbtoHexValue(200, 0, 200));
-		ModItems.backpack_Cyan = new BaseItemBackpack("backpackCyan", Utils.rgbtoHexValue(0, 200, 200));
-		// Tertiary Colours
-		ModItems.backpack_Maroon = new BaseItemBackpack("backpackMaroon", Utils.rgbtoHexValue(128, 0, 0));
-		ModItems.backpack_Olive = new BaseItemBackpack("backpackOlive", Utils.rgbtoHexValue(128, 128, 0));
-		ModItems.backpack_DarkGreen = new BaseItemBackpack("backpackDarkGreen", Utils.rgbtoHexValue(0, 128, 0));
-		ModItems.backpack_DarkPurple = new BaseItemBackpack("backpackDarkPurple", Utils.rgbtoHexValue(128, 0, 128));
-		ModItems.backpack_Teal = new BaseItemBackpack("backpackTeal", Utils.rgbtoHexValue(0, 128, 128));
-		ModItems.backpack_Navy = new BaseItemBackpack("backpackNavy", Utils.rgbtoHexValue(0, 0, 128));
-		// Shades
-		ModItems.backpack_Silver = new BaseItemBackpack("backpackSilver", Utils.rgbtoHexValue(192, 192, 192));
-		ModItems.backpack_Gray = new BaseItemBackpack("backpackGray", Utils.rgbtoHexValue(128, 128, 128));
-		ModItems.backpack_Black = new BaseItemBackpack("backpackBlack", Utils.rgbtoHexValue(20, 20, 20));
-		ModItems.backpack_White = new BaseItemBackpack("backpackWhite", Utils.rgbtoHexValue(240, 240, 240));
-
-		ModItems.itemBlueprintBase = new ItemBlueprint("itemBlueprint");
-
-		// Start meta Item Generation
+		//GameRegistry.registerItem(itemHeliumBlob, "itemHeliumBlob");
+
+		//Make some backpacks
+		//Primary colours
+		backpack_Red = new BaseItemBackpack("backpackRed", Utils.rgbtoHexValue(200, 0, 0));
+		backpack_Green = new BaseItemBackpack("backpackGreen", Utils.rgbtoHexValue(0, 200, 0));
+		backpack_Blue = new BaseItemBackpack("backpackBlue", Utils.rgbtoHexValue(0, 0, 200));
+		//Secondary Colours
+		backpack_Yellow = new BaseItemBackpack("backpackYellow", Utils.rgbtoHexValue(200, 200, 0));
+		backpack_Purple = new BaseItemBackpack("backpackPurple", Utils.rgbtoHexValue(200, 0, 200));
+		backpack_Cyan = new BaseItemBackpack("backpackCyan", Utils.rgbtoHexValue(0, 200, 200));
+		//Tertiary Colours
+		backpack_Maroon = new BaseItemBackpack("backpackMaroon", Utils.rgbtoHexValue(128, 0, 0));
+		backpack_Olive = new BaseItemBackpack("backpackOlive", Utils.rgbtoHexValue(128, 128, 0));
+		backpack_DarkGreen = new BaseItemBackpack("backpackDarkGreen", Utils.rgbtoHexValue(0, 128, 0));
+		backpack_DarkPurple = new BaseItemBackpack("backpackDarkPurple", Utils.rgbtoHexValue(128, 0, 128));
+		backpack_Teal = new BaseItemBackpack("backpackTeal", Utils.rgbtoHexValue(0, 128, 128));
+		backpack_Navy = new BaseItemBackpack("backpackNavy", Utils.rgbtoHexValue(0, 0, 128));
+		//Shades
+		backpack_Silver = new BaseItemBackpack("backpackSilver", Utils.rgbtoHexValue(192, 192, 192));
+		backpack_Gray = new BaseItemBackpack("backpackGray", Utils.rgbtoHexValue(128, 128, 128));
+		backpack_Black = new BaseItemBackpack("backpackBlack", Utils.rgbtoHexValue(20, 20, 20));
+		backpack_White = new BaseItemBackpack("backpackWhite", Utils.rgbtoHexValue(240, 240, 240));
+
+		itemBlueprintBase = new ItemBlueprint("itemBlueprint");
+
+		//Start meta Item Generation
 		ItemsFoods.load();
 
-		try {
-			// Elements generate first so they can be used in compounds.
-
-			// Uranium-233 is a fissile isotope of uranium that is bred from
-			// thorium-232 as part of the thorium fuel cycle.
-			MaterialGenerator.generate(ELEMENT.getInstance().URANIUM233);
-			MaterialGenerator.generate(ELEMENT.getInstance().ZIRCONIUM);
-
-			// Carbides - Tungsten Carbide exists in .09 so don't generate it. -
-			// Should still come before alloys though
-			if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
+		try{
+			//Elements generate first so they can be used in compounds.
+				     		
+			//Uranium-233 is a fissile isotope of uranium that is bred from thorium-232 as part of the thorium fuel cycle.
+	        MaterialGenerator.generate(ELEMENT.getInstance().URANIUM233);
+	        MaterialGenerator.generate(ELEMENT.getInstance().ZIRCONIUM);
+			
+			//Carbides - Tungsten Carbide exists in .09 so don't generate it. - Should still come before alloys though
+			if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
 				MaterialGenerator.generate(ALLOY.TUNGSTEN_CARBIDE);
 			}
 			MaterialGenerator.generate(ALLOY.SILICON_CARBIDE);
 			MaterialGenerator.generate(ALLOY.ZIRCONIUM_CARBIDE);
 			MaterialGenerator.generate(ALLOY.TANTALUM_CARBIDE);
-			MaterialGenerator.generate(ALLOY.NIOBIUM_CARBIDE);
-
-			// Generate some Alloys
-
-			// Misc Alloys
+			MaterialGenerator.generate(ALLOY.NIOBIUM_CARBIDE);	
+			
+			//Generate some Alloys
+			
+			//Misc Alloys
 			MaterialGenerator.generate(ALLOY.ENERGYCRYSTAL);
 			MaterialGenerator.generate(ALLOY.BLOODSTEEL);
 			MaterialGenerator.generate(ALLOY.BEDROCKIUM);
 			MaterialGenerator.generate(ALLOY.ZERON_100);
-			// Tumbaga was the name given by Spaniards to a non-specific alloy
-			// of gold and copper
+			//Tumbaga was the name given by Spaniards to a non-specific alloy of gold and copper 
 			MaterialGenerator.generate(ALLOY.TUMBAGA);
-			// Potin is traditionally an alloy of bronze, tin and lead, with
-			// varying quantities of each possible
+			//Potin is traditionally an alloy of bronze, tin and lead, with varying quantities of each possible
 			MaterialGenerator.generate(ALLOY.POTIN);
-
-			// Staballoy & Tantalloy
+			
+			//Staballoy & Tantalloy
 			MaterialGenerator.generate(ALLOY.STABALLOY);
 			MaterialGenerator.generate(ALLOY.TANTALLOY_60);
 			MaterialGenerator.generate(ALLOY.TANTALLOY_61);
 
-			// Inconel
+			//Inconel
 			MaterialGenerator.generate(ALLOY.INCONEL_625);
 			MaterialGenerator.generate(ALLOY.INCONEL_690);
 			MaterialGenerator.generate(ALLOY.INCONEL_792);
 
-			// Maraging Steel
+			
+			//Maraging Steel
 			MaterialGenerator.generate(ALLOY.MARAGING250);
 			MaterialGenerator.generate(ALLOY.MARAGING300);
 			MaterialGenerator.generate(ALLOY.MARAGING350);
-
-			// Composite Alloys
+			
+			//Composite Alloys
 			MaterialGenerator.generate(ALLOY.STELLITE);
-			MaterialGenerator.generate(ALLOY.TALONITE);
+			MaterialGenerator.generate(ALLOY.TALONITE);			
 
-			// Hastelloy
+			//Hastelloy
 			MaterialGenerator.generate(ALLOY.HASTELLOY_W);
 			MaterialGenerator.generate(ALLOY.HASTELLOY_X);
 			MaterialGenerator.generate(ALLOY.HASTELLOY_C276);
 			MaterialGenerator.generate(ALLOY.HASTELLOY_N);
 
-			// Incoloy
+			//Incoloy
 			MaterialGenerator.generate(ALLOY.INCOLOY_020);
 			MaterialGenerat