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.

1 files changed, 65 insertions, 53 deletions

diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java b/src/Java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java
index 5470891b68..ced6dd1d27 100644
--- a/src/Java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java
@@ -9,62 +9,74 @@ import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
 public class FR_Gregtech_Recipes {
+	
+	private static String rod_ElectrumFlux = "stickElectrumFlux";
+	private static String rod_LongElectrumFlux = "stickLongElectrumFlux";
+	private static String foil_Electrum = "foilElectrum";
+	private static String rod_Uranium = "stickUranium";
+	private static String rod_LongUranium = "stickLongUranium";
+	private static String foil_Uranium235 = "foilUranium235";
+	private static ItemStack hiveFrameAccelerated = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameAccelerated);
+	private static ItemStack hiveFrameMutagenic = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameMutagenic);
+	
 
-	private static String		rod_ElectrumFlux		= "stickElectrumFlux";
-	private static String		rod_LongElectrumFlux	= "stickLongElectrumFlux";
-	private static String		foil_Electrum			= "foilElectrum";
-	private static String		rod_Uranium				= "stickUranium";
-	private static String		rod_LongUranium			= "stickLongUranium";
-	private static String		foil_Uranium235			= "foilUranium235";
-	private static ItemStack	hiveFrameAccelerated	= ItemUtils
-			.getSimpleStack(FR_ItemRegistry.hiveFrameAccelerated);
-	private static ItemStack	hiveFrameMutagenic		= ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameMutagenic);
+	private static ItemStack hiveFrameCocoa = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameCocoa);
+	private static ItemStack hiveFrameCaged = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameCaged);
+	private static ItemStack hiveFrameSoul = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameSoul);
+	private static ItemStack hiveFrameClay = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameClay);
+	private static ItemStack hiveFrameNova = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameNova);
+	
+	private static ItemStack hiveFrameImpregnated = ItemUtils.getItemStack("Forestry:frameImpregnated", 1);
+	private static ItemStack blockSoulSand = new ItemStack(Blocks.soul_sand, 1);
+	private static ItemStack blockIronBars = new ItemStack (Blocks.iron_bars, 1);
+	private static ItemStack itemClayDust = new ItemStack(Items.clay_ball, 1);
+	private static ItemStack itemCocoaBeans = new ItemStack(Items.dye, 1, 3);
 
-	private static ItemStack	hiveFrameCocoa			= ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameCocoa);
-	private static ItemStack	hiveFrameCaged			= ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameCaged);
-	private static ItemStack	hiveFrameSoul			= ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameSoul);
-	private static ItemStack	hiveFrameClay			= ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameClay);
-	private static ItemStack	hiveFrameNova			= ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameNova);
 
-	private static ItemStack	hiveFrameImpregnated	= ItemUtils.getItemStack("Forestry:frameImpregnated", 1);
-	private static ItemStack	blockSoulSand			= new ItemStack(Blocks.soul_sand, 1);
-	private static ItemStack	blockIronBars			= new ItemStack(Blocks.iron_bars, 1);
-	private static ItemStack	itemClayDust			= new ItemStack(Items.clay_ball, 1);
-	private static ItemStack	itemCocoaBeans			= new ItemStack(Items.dye, 1, 3);
-
-	public static void registerItems() {
-
-		// Magic Bee Like Frames
-		RecipeUtils.recipeBuilder(FR_Gregtech_Recipes.rod_LongElectrumFlux, FR_Gregtech_Recipes.rod_ElectrumFlux,
-				FR_Gregtech_Recipes.rod_LongElectrumFlux, FR_Gregtech_Recipes.rod_LongElectrumFlux,
-				FR_Gregtech_Recipes.foil_Electrum, FR_Gregtech_Recipes.rod_LongElectrumFlux,
-				FR_Gregtech_Recipes.rod_ElectrumFlux, FR_Gregtech_Recipes.rod_ElectrumFlux,
-				FR_Gregtech_Recipes.rod_ElectrumFlux, FR_Gregtech_Recipes.hiveFrameAccelerated);
-
-		RecipeUtils.recipeBuilder(FR_Gregtech_Recipes.rod_LongUranium, FR_Gregtech_Recipes.rod_Uranium,
-				FR_Gregtech_Recipes.rod_LongUranium, FR_Gregtech_Recipes.rod_LongUranium,
-				FR_Gregtech_Recipes.foil_Uranium235, FR_Gregtech_Recipes.rod_LongUranium,
-				FR_Gregtech_Recipes.rod_Uranium, FR_Gregtech_Recipes.rod_Uranium, FR_Gregtech_Recipes.rod_Uranium,
-				FR_Gregtech_Recipes.hiveFrameMutagenic);
-
-		if (!LoadedMods.ExtraBees) {
-			// Extra Bee Like Frames
-			RecipeUtils.recipeBuilder(null, FR_Gregtech_Recipes.itemCocoaBeans, null,
-					FR_Gregtech_Recipes.itemCocoaBeans, FR_Gregtech_Recipes.hiveFrameImpregnated,
-					FR_Gregtech_Recipes.itemCocoaBeans, null, FR_Gregtech_Recipes.itemCocoaBeans, null,
-					FR_Gregtech_Recipes.hiveFrameCocoa);
-
-			RecipeUtils.recipeBuilder(FR_Gregtech_Recipes.hiveFrameImpregnated, FR_Gregtech_Recipes.blockIronBars, null,
-					null, null, null, null, null, null, FR_Gregtech_Recipes.hiveFrameCaged);
-
-			RecipeUtils.recipeBuilder(FR_Gregtech_Recipes.hiveFrameImpregnated, FR_Gregtech_Recipes.blockSoulSand, null,
-					null, null, null, null, null, null, FR_Gregtech_Recipes.hiveFrameSoul);
-
-			RecipeUtils.recipeBuilder(null, FR_Gregtech_Recipes.itemClayDust, null, FR_Gregtech_Recipes.itemClayDust,
-					FR_Gregtech_Recipes.hiveFrameImpregnated, FR_Gregtech_Recipes.itemClayDust, null,
-					FR_Gregtech_Recipes.itemClayDust, null, FR_Gregtech_Recipes.hiveFrameClay);
+	public static void registerItems(){
+		
+		//Magic Bee Like Frames
+		RecipeUtils.recipeBuilder(
+				rod_LongElectrumFlux, rod_ElectrumFlux, rod_LongElectrumFlux,
+				rod_LongElectrumFlux, foil_Electrum, rod_LongElectrumFlux,
+				rod_ElectrumFlux, rod_ElectrumFlux, rod_ElectrumFlux,
+				hiveFrameAccelerated);
+		
+		RecipeUtils.recipeBuilder(
+				rod_LongUranium, rod_Uranium, rod_LongUranium,
+				rod_LongUranium, foil_Uranium235, rod_LongUranium,
+				rod_Uranium, rod_Uranium, rod_Uranium,
+				hiveFrameMutagenic);
+		
+		if (!LoadedMods.ExtraBees){
+		//Extra Bee Like Frames
+		RecipeUtils.recipeBuilder(
+				null, itemCocoaBeans, null,
+				itemCocoaBeans, hiveFrameImpregnated, itemCocoaBeans,
+				null, itemCocoaBeans, null,
+				hiveFrameCocoa);
+		
+		RecipeUtils.recipeBuilder(
+				hiveFrameImpregnated, blockIronBars, null,
+				null, null, null,
+				null, null, null,
+				hiveFrameCaged);
+		
+		RecipeUtils.recipeBuilder(
+				hiveFrameImpregnated, blockSoulSand, null,
+				null, null, null,
+				null, null, null,
+				hiveFrameSoul);
+		
+		RecipeUtils.recipeBuilder(
+				null, itemClayDust, null,
+				itemClayDust, hiveFrameImpregnated, itemClayDust,
+				null, itemClayDust, null,
+				hiveFrameClay);
 		}
-
+		
+		
+		
 	}
-
+	
 }