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.

9 files changed, 709 insertions, 672 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java
index cc6f07f494..39b7fb41bd 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java
@@ -1,21 +1,34 @@
 package gtPlusPlus.xmod.gregtech.loaders;
 
-import cpw.mods.fml.common.event.FMLInterModComms;
-import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
 import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks;
 import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks2;
+import cpw.mods.fml.common.event.FMLInterModComms;
+import cpw.mods.fml.common.registry.GameRegistry;
 
 public class Gregtech_Blocks {
 
-	// Register default Tile Entity
-	private static void registerDefailtGtTe() {
+	public static void run(){
+
+		//Casing Blocks
+		ModBlocks.blockCasingsMisc = new GregtechMetaCasingBlocks();
+		ModBlocks.blockCasings2Misc = new GregtechMetaCasingBlocks2();
+		//ModBlocks.blockMetaTileEntity = new GregtechBlockMachines();
+		//registerDefailtGtTe();
+
+
+		
+
+	}
+
+	//Register default Tile Entity
+	private static void registerDefailtGtTe(){
 		Utils.LOG_INFO("Registering new GT TileEntities.");
 
-		final BaseMetaTileEntity tBaseMetaTileEntity = Meta_GT_Proxy.constructBaseMetaTileEntity();
+		BaseMetaTileEntity tBaseMetaTileEntity = Meta_GT_Proxy.constructBaseMetaTileEntity();
 
 		Utils.LOG_INFO("Testing BaseMetaTileEntity.");
 		if (tBaseMetaTileEntity == null) {
@@ -24,18 +37,7 @@ public class Gregtech_Blocks {
 		}
 		Utils.LOG_INFO("Registering the BaseMetaTileEntityEx.");
 		GameRegistry.registerTileEntity(tBaseMetaTileEntity.getClass(), "BaseMetaTileEntityEx");
-		FMLInterModComms.sendMessage("appliedenergistics2", "whitelist-spatial",
-				tBaseMetaTileEntity.getClass().getName());
-	}
-
-	public static void run() {
-
-		// Casing Blocks
-		ModBlocks.blockCasingsMisc = new GregtechMetaCasingBlocks();
-		ModBlocks.blockCasings2Misc = new GregtechMetaCasingBlocks2();
-		// ModBlocks.blockMetaTileEntity = new GregtechBlockMachines();
-		// registerDefailtGtTe();
-
+		FMLInterModComms.sendMessage("appliedenergistics2", "whitelist-spatial", tBaseMetaTileEntity.getClass().getName());
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java
index 076188e33b..b34aead51e 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java
@@ -1,6 +1,9 @@
 package gtPlusPlus.xmod.gregtech.loaders;
 
-import gregtech.api.enums.*;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.SubTag;
+import gregtech.api.enums.ToolDictNames;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.core.util.Utils;
@@ -12,94 +15,78 @@ import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
 import net.minecraft.item.ItemStack;
 
 public class ProcessingToolHeadChoocher implements Interface_OreRecipeRegistrator, Runnable {
-	public ProcessingToolHeadChoocher() {
-		GregtechOrePrefixes.toolSkookumChoocher.add(this);
-	}
-
-	public void materialsLoops() {
-		final Materials[] i = Materials.values();
-		final int size = i.length;
-		Utils.LOG_WARNING("Materials to attempt tool gen. with: " + size);
-		int used = 0;
-		Materials aMaterial = null;
-		for (int r = 0; r < size; r++) {
-			aMaterial = i[r];
-			if (aMaterial != Materials.Stone && aMaterial != Materials.Flint && aMaterial != Materials.Rubber
-					&& aMaterial != Materials._NULL) {
-				if (!aMaterial.contains(SubTag.WOOD) && !aMaterial.contains(SubTag.BOUNCY)
-						&& !aMaterial.contains(SubTag.NO_SMASHING) && !aMaterial.contains(SubTag.TRANSPARENT)
-						&& !aMaterial.contains(SubTag.FLAMMABLE) && !aMaterial.contains(SubTag.MAGICAL)
-						&& !aMaterial.contains(SubTag.NO_SMELTING)) {
-					Utils.LOG_WARNING("Found " + aMaterial.name() + " as a valid Skookum Choocher Material.");
-					// Input 1
-					final ItemStack plate = GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L);
-					final ItemStack ingot = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L);
-					final ItemStack screw = GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L);
-					final ItemStack longrod = GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L);
-					final ItemStack hammerhead = GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial, 1L);
-
-					if (null != plate && null != ingot && null != hammerhead && null != longrod && null != screw) {
-						RecipeUtils.recipeBuilder(hammerhead, ToolDictNames.craftingToolScrewdriver.name(), plate,
-								ingot, plate, plate, longrod, screw, null,
-								MetaGeneratedGregtechTools.INSTANCE.getToolWithStats(
-										MetaGeneratedGregtechTools.SKOOKUM_CHOOCHER, 1, aMaterial, null, null));
-						used++;
-					}
-					else {
-						Utils.LOG_WARNING("" + aMaterial.name() + " could not be used for all input compoenents. [3x"
-								+ aMaterial.name() + " plates, 2x" + aMaterial.name() + " ingots, 1x" + aMaterial.name()
-								+ " Hard Hammer Head.");
-					}
-					// GT_ModHandler.addCraftingRecipe(,
-					// GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS |
-					// GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"P H",
-					// "PIP", " I ", Character.valueOf('I'),
-					// OrePrefixes.ingot.get(aMaterial), Character.valueOf('P'),
-					// OrePrefixes.plate.get(aMaterial), Character.valueOf('H'),
-					// OrePrefixes.toolHeadHammer.get(aMaterial)});
-				}
-				else {
-					Utils.LOG_WARNING("" + aMaterial.name() + " was not a valid Skookum Choocher Material.");
-				}
-			}
-			else {
-				Utils.LOG_WARNING("" + aMaterial.name() + " was not a valid Skookum Choocher Material.");
-			}
+    public ProcessingToolHeadChoocher() {
+        GregtechOrePrefixes.toolSkookumChoocher.add(this);
+    }
 
-		}
-
-		Utils.LOG_INFO("Materials used for tool gen: " + used);
-	}
+    @Override
+	public void registerOre(GregtechOrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) {
+        if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)) {
+            if (aMaterial != Materials.Rubber)
+            if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY)) && (!aMaterial.contains(SubTag.NO_SMASHING))) {
+                GT_ModHandler.addCraftingRecipe(MetaGeneratedGregtechTools.INSTANCE.getToolWithStats(16, 1, aMaterial, aMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"IhI", "III", " I ", Character.valueOf('I'), OrePrefixes.ingot.get(aMaterial)});
+              }
+        }
+    }
 
 	@Override
-	public void registerOre(final GregtechOrePrefixes aPrefix, final GT_Materials aMaterial, final String aOreDictName,
-			final String aModName, final ItemStack aStack) {
+	public void registerOre(GregtechOrePrefixes aPrefix,
+			GT_Materials aMaterial, String aOreDictName, String aModName,
+			ItemStack aStack) {
 		// TODO Auto-generated method stub
-
+		
 	}
-
-	@Override
-	public void registerOre(final GregtechOrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName,
-			final String aModName, final ItemStack aStack) {
-		if (aMaterial != Materials.Stone && aMaterial != Materials.Flint) {
-			if (aMaterial != Materials.Rubber) {
-				if (!aMaterial.contains(SubTag.WOOD) && !aMaterial.contains(SubTag.BOUNCY)
-						&& !aMaterial.contains(SubTag.NO_SMASHING)) {
-					GT_ModHandler.addCraftingRecipe(
-							MetaGeneratedGregtechTools.INSTANCE.getToolWithStats(16, 1, aMaterial, aMaterial, null),
-							GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
-							new Object[] {
-									"IhI", "III", " I ", Character.valueOf('I'), OrePrefixes.ingot.get(aMaterial)
-							});
+	
+	public void materialsLoops(){
+		Materials[] i = Materials.values();
+		int size = i.length;
+		Utils.LOG_WARNING("Materials to attempt tool gen. with: "+size);
+		int used = 0;
+		Materials aMaterial = null;
+		for (int r=0;r<size;r++){
+			aMaterial = i[r];			
+			if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint) && (aMaterial != Materials.Rubber) && (aMaterial != Materials._NULL)) {	     
+	            if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY)) && (!aMaterial.contains(SubTag.NO_SMASHING))&& (!aMaterial.contains(SubTag.TRANSPARENT))&& (!aMaterial.contains(SubTag.FLAMMABLE))&& (!aMaterial.contains(SubTag.MAGICAL))&& (!aMaterial.contains(SubTag.NO_SMELTING))) {
+	        		Utils.LOG_WARNING("Found "+aMaterial.name()+" as a valid Skookum Choocher Material.");
+	        		//Input 1
+	        		ItemStack plate = GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L);
+	        		ItemStack ingot = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L);
+	        		ItemStack screw = GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L);
+	        		ItemStack longrod = GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L);
+	        		ItemStack hammerhead = GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial, 1L);
+	        		
+	        		if (null != plate && null != ingot && null != hammerhead && null != longrod && null != screw){
+	        			RecipeUtils.recipeBuilder(
+		        				hammerhead, ToolDictNames.craftingToolScrewdriver.name(), plate,
+		        				ingot, plate, plate,
+		        				longrod, screw, null,		        				
+		        				MetaGeneratedGregtechTools.INSTANCE.getToolWithStats(MetaGeneratedGregtechTools.SKOOKUM_CHOOCHER, 1, aMaterial, null, null));
+		        		used++;
+	        		}    
+	        		else {
+	        			Utils.LOG_WARNING(""+aMaterial.name()+" could not be used for all input compoenents. [3x"+aMaterial.name()+" plates, 2x"+aMaterial.name()+" ingots, 1x"+aMaterial.name()+" Hard Hammer Head.");
+	        		}
+	                //GT_ModHandler.addCraftingRecipe(, GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"P H", "PIP", " I ", Character.valueOf('I'), OrePrefixes.ingot.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(aMaterial), Character.valueOf('H'), OrePrefixes.toolHeadHammer.get(aMaterial)});
+	              }
+	            else {
+					Utils.LOG_WARNING(""+aMaterial.name()+" was not a valid Skookum Choocher Material.");			
 				}
+	        }
+			else {
+				Utils.LOG_WARNING(""+aMaterial.name()+" was not a valid Skookum Choocher Material.");			
 			}
+			
+			
 		}
+		
+		Utils.LOG_INFO("Materials used for tool gen: "+used);
 	}
 
 	@Override
 	public void run() {
 		Utils.LOG_INFO("Generating Skookum Choochers of all GT Materials.");
-		this.materialsLoops();
+		materialsLoops();		
 	}
-
+	
+	
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/Processing_Textures_Items.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/Processing_Textures_Items.java
index 783370f612..41e0511ace 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/Processing_Textures_Items.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/Processing_Textures_Items.java
@@ -3,7 +3,8 @@ package gtPlusPlus.xmod.gregtech.loaders;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechTextures.ItemIcons.CustomIcon;
 
 public class Processing_Textures_Items {
-
+	
 	public static final CustomIcon itemSkookumChoocher = new CustomIcon("iconsets/SKOOKUMCHOOCHER");
-
+	
 }
+
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
index a7965327fe..42f3829045 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
@@ -1,7 +1,5 @@
 package gtPlusPlus.xmod.gregtech.loaders;
 
-import java.util.ArrayList;
-
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
 import gtPlusPlus.core.lib.CORE;
@@ -9,97 +7,97 @@ import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialStack;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.item.ItemUtils;
+
+import java.util.ArrayList;
+
 import net.minecraft.item.ItemStack;
 
-public class RecipeGen_BlastSmelter implements Runnable {
+public class RecipeGen_BlastSmelter  implements Runnable{
+
+	final Material toGenerate;
+	
+	public RecipeGen_BlastSmelter(final Material M){
+		this.toGenerate = M;
+	}
+	
+	@Override
+	public void run() {
+		generateARecipe(toGenerate);		
+	}
 
-	public static void generateARecipe(final Material M) {
+	public static void generateARecipe(final Material M){
 
-		// Add a Blast Smelting Recipe, Let's go!
+		//Add a Blast Smelting Recipe, Let's go!			
 		ItemStack tStack;
 		if (null != (tStack = M.getDust(1))) {
 
-			// Prepare some Variables
+			//Prepare some Variables
 			ItemStack[] components;
 			ArrayList<MaterialStack> tMaterial = new ArrayList<MaterialStack>();
-			short counter = 0;
-			int inputStackCount = 0;
-			int fluidAmount = 0;
-			final boolean doTest = true;
-			tMaterial = M.getComposites();
+			short counter=0;
+			int inputStackCount=0;
+			int fluidAmount=0;
+			boolean doTest = true;
+			tMaterial = M.getComposites();	
 
-			// This Bad boy here is what dictates unique recipes. Fuck life,
-			// right?
+			//This Bad boy here is what dictates unique recipes. Fuck life, right?
 			ItemStack circuitGT = ItemUtils.getGregtechCircuit(0);
 
-			// Set a duration
+
+			//Set a duration
 			int duration = 0;
-			if (M.getMeltingPointK() > 150) {
+			if (M.getMeltingPointK() > 150){
 				duration = (int) Math.max(M.getMass() / 50L, 1L) * M.getMeltingPointK();
 			}
 			else {
-				duration = (int) Math.max(M.getMass() / 50L, 1L) * 150;
+				duration = (int) Math.max(M.getMass() / 50L, 1L) * 150;	
 			}
 
-			int mMaterialListSize = 0;
-			if (M.getComposites() != null) {
-				for (final gtPlusPlus.core.material.MaterialStack ternkfsdf : M.getComposites()) {
-					if (ternkfsdf != null) {
-						mMaterialListSize++;
-					}
+
+			int mMaterialListSize=0;
+			if (M.getComposites() != null){
+				for (gtPlusPlus.core.material.MaterialStack ternkfsdf : M.getComposites()){
+					if (ternkfsdf != null)
+					mMaterialListSize++;
 				}
 			}
 			else {
-				mMaterialListSize = 1;
-			}
+				mMaterialListSize = 1;			
+			}			
+
+			Utils.LOG_WARNING("Size: "+mMaterialListSize);
 
-			Utils.LOG_WARNING("Size: " + mMaterialListSize);
 
-			// Make a simple one Material Materialstack[] and log it for
-			// validity.
+			//Make a simple one Material Materialstack[] and log it for validity.										
 			circuitGT = ItemUtils.getGregtechCircuit(1);
-			final ItemStack[] tItemStackTest = new ItemStack[] {
-					circuitGT, tStack
-			};
+			ItemStack[] tItemStackTest = new ItemStack[]{circuitGT, tStack};
 			inputStackCount = 1;
-			fluidAmount = 144 * inputStackCount;
-			Utils.LOG_WARNING("Adding an Alloy Blast Smelter Recipe for " + M.getLocalizedName() + ". Gives "
-					+ fluidAmount + "L of molten metal.");
-			for (int das = 0; das < tItemStackTest.length; das++) {
-				if (tItemStackTest[das] != null) {
-					Utils.LOG_WARNING("tMaterial[" + das + "]: " + tItemStackTest[das].getDisplayName() + " Meta: "
-							+ tItemStackTest[das].getItemDamage() + ", Amount: " + tItemStackTest[das].stackSize);
-				}
+			fluidAmount = 144*inputStackCount;
+			Utils.LOG_WARNING("Adding an Alloy Blast Smelter Recipe for "+M.getLocalizedName()+". Gives "+fluidAmount+"L of molten metal.");
+			for (int das=0;das<tItemStackTest.length;das++){
+				if (tItemStackTest[das] != null)
+					Utils.LOG_WARNING("tMaterial["+das+"]: "+tItemStackTest[das].getDisplayName()+" Meta: "+tItemStackTest[das].getItemDamage()+", Amount: "+tItemStackTest[das].stackSize);
 			}
+			
+			boolean hasMoreInputThanACircuit = (tItemStackTest.length > 1);
 
-			final boolean hasMoreInputThanACircuit = tItemStackTest.length > 1;
-
-			// Generate Recipes for all singular materials that can be made
-			// molten.
-			if (hasMoreInputThanACircuit) {
+			//Generate Recipes for all singular materials that can be made molten.
+			if (hasMoreInputThanACircuit){
 				if (M.requiresBlastFurnace()) {
-					if (CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getFluid(fluidAmount), 100, duration, 240)) {
+					if (CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getFluid(fluidAmount), 100, duration, 240)){
 						Utils.LOG_WARNING("Success.");
-						if (GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Ingot.get(0), M.getFluid(144),
-								M.getIngot(1), duration, 120)) {
+						if (GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Ingot.get(0), M.getFluid(144), M.getIngot(1), duration, 120)){
 							Utils.LOG_INFO("Success, Also added a Fluid solidifier recipe.");
-							if (GT_Values.RA.addFluidExtractionRecipe(M.getIngot(1), null, M.getFluid(144), 100,
-									duration, 120)) {
+							if (GT_Values.RA.addFluidExtractionRecipe(M.getIngot(1), null, M.getFluid(144), 100, duration, 120)){
 								Utils.LOG_INFO("Success, Also added a Fluid Extractor recipe.");
 							}
-							if (GT_Values.RA
-									.addFluidExtractionRecipe(
-											ItemUtils.getItemStackOfAmountFromOreDictNoBroken(
-													"nugget" + M.getUnlocalizedName(), 1),
-											null, M.getFluid(16), 100, duration / 9, 120)) {
+							if (GT_Values.RA.addFluidExtractionRecipe(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("nugget"+M.getUnlocalizedName(), 1), null, M.getFluid(16), 100, duration/9, 120)){
 								Utils.LOG_INFO("Success, Also added a Fluid Extractor recipe.");
 							}
-							if (GT_Values.RA.addFluidExtractionRecipe(M.getSmallDust(1), null, M.getFluid(36), 100,
-									duration / 4, 120)) {
+							if (GT_Values.RA.addFluidExtractionRecipe(M.getSmallDust(1), null, M.getFluid(36), 100, duration/4, 120)){
 								Utils.LOG_INFO("Success, Also added a Fluid Extractor recipe.");
 							}
-							if (GT_Values.RA.addFluidExtractionRecipe(M.getTinyDust(1), null, M.getFluid(16), 100,
-									duration / 9, 120)) {
+							if (GT_Values.RA.addFluidExtractionRecipe(M.getTinyDust(1), null, M.getFluid(16), 100, duration/9, 120)){
 								Utils.LOG_INFO("Success, Also added a Fluid Extractor recipe.");
 							}
 						}
@@ -110,117 +108,103 @@ public class RecipeGen_BlastSmelter implements Runnable {
 				}
 			}
 			else {
-				if (CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getFluid(fluidAmount), 100, duration / 2, 120)) {
+				if (CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getFluid(fluidAmount), 100, duration/2, 120)){
 					Utils.LOG_WARNING("Success.");
-					if (GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Ingot.get(0), M.getFluid(144),
-							M.getIngot(1), duration / 2, 60)) {
+					if (GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Ingot.get(0), M.getFluid(144), M.getIngot(1), duration/2, 60)){
 						Utils.LOG_INFO("Success, Also added a Fluid solidifier recipe.");
-						if (GT_Values.RA.addFluidExtractionRecipe(M.getIngot(1), null, M.getFluid(144), 100,
-								duration / 2, 60)) {
+						if (GT_Values.RA.addFluidExtractionRecipe(M.getIngot(1), null, M.getFluid(144), 100, duration/2, 60)){
 							Utils.LOG_INFO("Success, Also added a Fluid Extractor recipe.");
 						}
-						final ItemStack tempitem = ItemUtils
-								.getItemStackOfAmountFromOreDictNoBroken("nugget" + M.getUnlocalizedName(), 1);
-						if (tempitem != null) {
-							if (GT_Values.RA.addFluidExtractionRecipe(tempitem, null, M.getFluid(16), 100,
-									duration / 2 / 9, 60)) {
+						ItemStack tempitem = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("nugget"+M.getUnlocalizedName(), 1);
+						if (tempitem != null){
+							if (GT_Values.RA.addFluidExtractionRecipe(tempitem, null, M.getFluid(16), 100, duration/2/9, 60)){
 								Utils.LOG_INFO("Success, Also added a Fluid Extractor recipe.");
 							}
-						}
-						if (GT_Values.RA.addFluidExtractionRecipe(M.getSmallDust(1), null, M.getFluid(36), 100,
-								duration / 2 / 4, 60)) {
+						}						
+						if (GT_Values.RA.addFluidExtractionRecipe(M.getSmallDust(1), null, M.getFluid(36), 100, duration/2/4, 60)){
 							Utils.LOG_INFO("Success, Also added a Fluid Extractor recipe.");
 						}
-						if (GT_Values.RA.addFluidExtractionRecipe(M.getTinyDust(1), null, M.getFluid(16), 100,
-								duration / 2 / 9, 60)) {
+						if (GT_Values.RA.addFluidExtractionRecipe(M.getTinyDust(1), null, M.getFluid(16), 100, duration/2/9, 60)){
 							Utils.LOG_INFO("Success, Also added a Fluid Extractor recipe.");
 						}
 					}
-				}
+				}	
 				else {
 					Utils.LOG_WARNING("Failed.");
-				}
-			}
+				}				
+			}		
 
-			if (tMaterial != null) {
-				// Reset the Variables for compounds if last recipe was a
-				// success.
-				inputStackCount = 0;
-				counter = 0;
+			if (tMaterial != null){
+				//Reset the Variables for compounds if last recipe was a success.
+				inputStackCount=0;
+				counter=0;
 
-				// If this Material has some kind of compound list, proceed
-				if (mMaterialListSize > 1) {
-					final gtPlusPlus.core.material.MaterialStack[] tempStack = new gtPlusPlus.core.material.MaterialStack[mMaterialListSize];
-					circuitGT = ItemUtils.getGregtechCircuit(mMaterialListSize);
-					// Just double checking
-					if (tempStack.length > 1) {
 
-						// Builds me a MaterialStack[] from the MaterialList of
-						// M.
-						int ooo = 0;
-						for (final gtPlusPlus.core.material.MaterialStack xMaterial : M.getComposites()) {
-							if (xMaterial != null) {
-								if (xMaterial.getStackMaterial() != null) {
-									Utils.LOG_WARNING("FOUND: " + xMaterial.getStackMaterial().getLocalizedName());
-									Utils.LOG_WARNING("ADDING: " + xMaterial.getStackMaterial().getLocalizedName());
-								}
-								tempStack[ooo] = xMaterial;
-							}
+
+				//If this Material has some kind of compound list, proceed
+				if (mMaterialListSize > 1){
+					gtPlusPlus.core.material.MaterialStack[] tempStack = new gtPlusPlus.core.material.MaterialStack[mMaterialListSize];
+					circuitGT = ItemUtils.getGregtechCircuit(mMaterialListSize);
+					//Just double checking
+					if (tempStack.length > 1){
+
+						//Builds me a MaterialStack[] from the MaterialList of M.
+						int ooo=0;
+						for (gtPlusPlus.core.material.MaterialStack xMaterial : M.getComposites()){
+							if (xMaterial != null){
+								if (xMaterial.getStackMaterial() != null){
+									Utils.LOG_WARNING("FOUND: "+xMaterial.getStackMaterial().getLocalizedName());
+									Utils.LOG_WARNING("ADDING: "+xMaterial.getStackMaterial().getLocalizedName());									
+								}								
+								tempStack[ooo] = xMaterial;								
+							}								
 							ooo++;
 						}
 
-						// Builds me an ItemStack[] of the materials. - Without
-						// a circuit - this gets a good count for the 144L fluid
-						// multiplier
+						//Builds me an ItemStack[] of the materials. - Without a circuit - this gets a good count for the 144L fluid multiplier
 						components = new ItemStack[9];
-						inputStackCount = 0;
-						for (int irc = 0; irc < M.getComposites().size(); irc++) {
-							if (M.getComposites().get(irc) != null) {
-								final int r = (int) M.vSmallestRatio[irc];
-								inputStackCount = inputStackCount + r;
+						inputStackCount=0;
+						for (int irc=0;irc<M.getComposites().size();irc++){
+							if (M.getComposites().get(irc) != null){
+								int r = (int) M.vSmallestRatio[irc];
+								inputStackCount = inputStackCount+r;
 								components[irc] = M.getComposites().get(irc).getDustStack(r);
-							}
+							}						
 						}
 
-						// Adds a circuit
-						if (mMaterialListSize < 9 && mMaterialListSize != 0) {
-							final ItemStack[] components_NoCircuit = components;
-							// Builds me an ItemStack[] of the materials. - With
-							// a circuit
-							components = new ItemStack[components_NoCircuit.length + 1];
-							for (int fr = 0; fr < components.length; fr++) {
-								if (fr == 0) {
+
+						//Adds a circuit
+						if (mMaterialListSize < 9 && mMaterialListSize != 0){
+							ItemStack[] components_NoCircuit = components;
+							//Builds me an ItemStack[] of the materials. - With a circuit
+							components = new ItemStack[components_NoCircuit.length+1];
+							for (int fr=0;fr<components.length;fr++){						
+								if (fr==0){
 									components[0] = circuitGT;
 								}
 								else {
-									components[fr] = components_NoCircuit[fr - 1];
-								}
+									components[fr] = components_NoCircuit[fr-1];
+								}								
 							}
-							Utils.LOG_INFO("Should have added a circuit. mMaterialListSize: " + mMaterialListSize
-									+ " | circuit: " + components[0].getDisplayName());
+							Utils.LOG_INFO("Should have added a circuit. mMaterialListSize: "+mMaterialListSize+" | circuit: "+components[0].getDisplayName());
 						}
 						else {
-							Utils.LOG_INFO("Did not add a circuit. mMaterialListSize: " + mMaterialListSize);
+							Utils.LOG_INFO("Did not add a circuit. mMaterialListSize: "+mMaterialListSize);
 						}
 
-						// Set Fluid output
-						fluidAmount = 144 * inputStackCount;
+						//Set Fluid output
+						fluidAmount = 144*inputStackCount;
 
-						Utils.LOG_INFO("Adding an Alloy Blast Smelter Recipe for " + M.getLocalizedName()
-								+ " using it's compound dusts. This material has " + inputStackCount + " parts. Gives "
-								+ fluidAmount + "L of molten metal.");
-						Utils.LOG_INFO("tMaterial.length: " + components.length + ".");
-						for (int das = 0; das < components.length; das++) {
-							if (components[das] != null) {
-								Utils.LOG_INFO("tMaterial[" + das + "]: " + components[das].getDisplayName() + " Meta: "
-										+ components[das].getItemDamage() + ", Amount: " + components[das].stackSize);
-							}
+						Utils.LOG_INFO("Adding an Alloy Blast Smelter Recipe for "+M.getLocalizedName()+" using it's compound dusts. This material has "+ inputStackCount+" parts. Gives "+fluidAmount+"L of molten metal.");
+						Utils.LOG_INFO("tMaterial.length: "+components.length+".");
+						for (int das=0;das<components.length;das++){
+							if (components[das] != null)
+								Utils.LOG_INFO("tMaterial["+das+"]: "+components[das].getDisplayName()+" Meta: "+components[das].getItemDamage()+", Amount: "+components[das].stackSize);
 						}
 
-						// Adds Recipe
+						//Adds Recipe
 						if (M.requiresBlastFurnace()) {
-							if (CORE.RA.addBlastSmelterRecipe(components, M.getFluid(fluidAmount), 100, duration,
-									500)) {
+							if (CORE.RA.addBlastSmelterRecipe(components, M.getFluid(fluidAmount), 100, duration, 500)){
 								Utils.LOG_WARNING("Success.");
 							}
 							else {
@@ -228,31 +212,19 @@ public class RecipeGen_BlastSmelter implements Runnable {
 							}
 						}
 						else {
-							if (CORE.RA.addBlastSmelterRecipe(components, M.getFluid(fluidAmount), 100, duration,
-									240)) {
+							if (CORE.RA.addBlastSmelterRecipe(components, M.getFluid(fluidAmount), 100, duration, 240)){
 								Utils.LOG_WARNING("Success.");
-							}
+							}	
 							else {
 								Utils.LOG_WARNING("Failed.");
-							}
+							}						
 						}
 					}
 				}
 			}
 			else {
-				Utils.LOG_WARNING("doTest: " + doTest + " | tMaterial != null: " + (tMaterial != null));
+				Utils.LOG_WARNING("doTest: "+doTest+" | tMaterial != null: "+(tMaterial != null));
 			}
 		}
 	}
-
-	final Material toGenerate;
-
-	public RecipeGen_BlastSmelter(final Material M) {
-		this.toGenerate = M;
-	}
-
-	@Override
-	public void run() {
-		RecipeGen_BlastSmelter.generateARecipe(this.toGenerate);
-	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT.java
index 8044c78a39..be2dbff77a 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT.java
@@ -1,6 +1,8 @@
 package gtPlusPlus.xmod.gregtech.loaders;
 
-import gregtech.api.enums.*;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.SubTag;
 import gregtech.api.objects.MaterialStack;
 import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.core.lib.CORE;
@@ -8,173 +10,157 @@ import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.item.ItemUtils;
 import net.minecraft.item.ItemStack;
 
-public class RecipeGen_BlastSmelterGT implements Runnable {
+public class RecipeGen_BlastSmelterGT  implements Runnable{
+	
+	public RecipeGen_BlastSmelterGT(){
+		
+	}
+	
+	@Override
+	public void run() {
+		generateRecipes();		
+	}
 
-	public static void generateRecipes() {
+	public static void generateRecipes(){
 
-		final Materials[] GregMaterials = Materials.values();
+		Materials[] GregMaterials = Materials.values();
 
-		for (final Materials M : GregMaterials) {
+		for (Materials M : GregMaterials){
 
 			if (M.equals(Materials.Iridium) || M.equals(Materials.Osmium) || M.equals(Materials.Osmiridium)
-					|| !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium)
-					|| !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium)
-					|| !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium)
-					|| !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium)
-					|| !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium)
-					|| !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium)) {
-
-				// Add a Blast Smelting Recipe, Let's go!
+					|| !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium)
+					|| !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium)
+					|| !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium)
+					|| !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium)
+					){
+
+
+				//Add a Blast Smelting Recipe, Let's go!			
 				ItemStack tStack;
-				if (null != (tStack = GT_OreDictUnificator.get(OrePrefixes.ingot, M.mSmeltInto, 1L))
-						&& !M.contains(SubTag.NO_SMELTING) && M.contains(SubTag.METAL)) {
+				if ((null != (tStack = GT_OreDictUnificator.get(OrePrefixes.ingot, M.mSmeltInto, 1L))) && (!M.contains(SubTag.NO_SMELTING) && (M.contains(SubTag.METAL)))) {
 
-					// Prepare some Variables
+					//Prepare some Variables
 					ItemStack[] components;
 					MaterialStack[] tMaterial;
-					short counter = 0;
-					int inputStackCount = 0;
-					int fluidAmount = 0;
+					short counter=0;
+					int inputStackCount=0;
+					int fluidAmount=0;
 					boolean doTest = true;
 
-					// This Bad boy here is what dictates unique recipes. Fuck
-					// life, right?
+					//This Bad boy here is what dictates unique recipes. Fuck life, right?
 					ItemStack circuitGT = ItemUtils.getGregtechCircuit(0);
 
-					// Set a duration
+
+					//Set a duration
 					int duration = 0;
-					if (M.mBlastFurnaceTemp > 150) {
+					if (M.mBlastFurnaceTemp > 150){
 						duration = (int) Math.max(M.getMass() / 50L, 1L) * M.mBlastFurnaceTemp;
 					}
 					else {
-						duration = (int) Math.max(M.getMass() / 50L, 1L) * 150;
+						duration = (int) Math.max(M.getMass() / 50L, 1L) * 150;	
 					}
 
-					// Make a simple one Material Materialstack[] and log it for
-					// validity.
-					tMaterial = new MaterialStack[] {
-							new MaterialStack(M, 1)
-					};
+
+					//Make a simple one Material Materialstack[] and log it for validity.
+					tMaterial = new MaterialStack[]{new MaterialStack(M, 1)};	
 					circuitGT = ItemUtils.getGregtechCircuit(1);
-					final ItemStack[] tItemStackTest = new ItemStack[] {
-							circuitGT, ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dust" + M, 1)
-					};
+					ItemStack[] tItemStackTest = new ItemStack[]{circuitGT, ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dust"+M, 1)};
 					inputStackCount = 1;
-					fluidAmount = 144 * inputStackCount;
-					Utils.LOG_WARNING("Adding an Alloy Blast Smelter Recipe for " + M + ". Gives " + fluidAmount
-							+ "L of molten metal.");
-					Utils.LOG_WARNING("tMaterial.length: " + tMaterial.length + ".");
-					for (int das = 0; das < tItemStackTest.length; das++) {
-						if (tItemStackTest[das] != null) {
-							Utils.LOG_WARNING("tMaterial[" + das + "]: " + tItemStackTest[das].getDisplayName()
-									+ " Meta: " + tItemStackTest[das].getItemDamage() + ", Amount: "
-									+ tItemStackTest[das].stackSize);
-						}
+					fluidAmount = 144*inputStackCount;
+					Utils.LOG_WARNING("Adding an Alloy Blast Smelter Recipe for "+M+". Gives "+fluidAmount+"L of molten metal.");
+					Utils.LOG_WARNING("tMaterial.length: "+tMaterial.length+".");
+					for (int das=0;das<tItemStackTest.length;das++){
+						if (tItemStackTest[das] != null)
+							Utils.LOG_WARNING("tMaterial["+das+"]: "+tItemStackTest[das].getDisplayName()+" Meta: "+tItemStackTest[das].getItemDamage()+", Amount: "+tItemStackTest[das].stackSize);
 					}
 
-					// Generate Recipes for all singular materials that can be
-					// made molten.
+					//Generate Recipes for all singular materials that can be made molten.
 					if (M.mBlastFurnaceRequired) {
-						doTest = CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getMolten(fluidAmount), 100, duration,
-								240);
+						doTest = CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getMolten(fluidAmount), 100, duration, 240);
 					}
 					else {
-						doTest = CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getMolten(fluidAmount), 100,
-								duration / 2, 120);
+						doTest = CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getMolten(fluidAmount), 100, duration/2, 120);