- Removed threaded registration idea.

4 files changed, 85 insertions, 56 deletions

diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 21d3ff8db7..c1e40cf6d8 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -156,6 +156,7 @@ public final class ModItems {
 
 
 	//@SuppressWarnings("unused")
+	@SuppressWarnings("unused")
 	public static final void init(){
 
 		AAA_Broken = new BaseItemIngot("AAA_Broken", "Errors - Tell Alkalus", Utils.rgbtoHexValue(128, 128, 128), 0);
@@ -204,61 +205,68 @@ public final class ModItems {
 
 		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.generateItemsFromMaterial(ELEMENT.getInstance().URANIUM233);
-			MaterialGenerator.generateItemsFromMaterial(ELEMENT.getInstance().ZIRCONIUM);
+	        new MaterialGenerator(ELEMENT.getInstance().URANIUM233);
+	        new MaterialGenerator(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.generateItemsFromMaterial(ALLOY.TUNGSTEN_CARBIDE);
+				new MaterialGenerator(ALLOY.TUNGSTEN_CARBIDE);
 			}
-			MaterialGenerator.generateItemsFromMaterial(ALLOY.SILICON_CARBIDE);
-			MaterialGenerator.generateItemsFromMaterial(ALLOY.ZIRCONIUM_CARBIDE);
-			MaterialGenerator.generateItemsFromMaterial(ALLOY.TANTALUM_CARBIDE);
-			MaterialGenerator.generateItemsFromMaterial(ALLOY.NIOBIUM_CARBIDE);	
+			new MaterialGenerator(ALLOY.SILICON_CARBIDE);
+			new MaterialGenerator(ALLOY.ZIRCONIUM_CARBIDE);
+			new MaterialGenerator(ALLOY.TANTALUM_CARBIDE);
+			new MaterialGenerator(ALLOY.NIOBIUM_CARBIDE);	
 			
 			//Generate some Alloys
-			MaterialGenerator.generateItemsFromMaterial(ALLOY.ENERGYCRYSTAL);
-			MaterialGenerator.generateItemsFromMaterial(ALLOY.BLOODSTEEL);
-			MaterialGenerator.generateItemsFromMaterial(ALLOY.BEDROCKIUM);
-			
-			MaterialGenerator.generateItemsFromMaterial(ALLOY.STABALLOY);
-			MaterialGenerator.generateItemsFromMaterial(ALLOY.TANTALLOY_60);
-			MaterialGenerator.generateItemsFromMaterial(ALLOY.TANTALLOY_61);
-
-			MaterialGenerator.generateItemsFromMaterial(ALLOY.INCONEL_625);
-			MaterialGenerator.generateItemsFromMaterial(ALLOY.INCONEL_690);
-			MaterialGenerator.generateItemsFromMaterial(ALLOY.INCONEL_792);
-
-			MaterialGenerator.generateItemsFromMaterial(ALLOY.ZERON_100);
-			
-			MaterialGenerator.generateItemsFromMaterial(ALLOY.MARAGING250);
-			MaterialGenerator.generateItemsFromMaterial(ALLOY.MARAGING300);
-			MaterialGenerator.generateItemsFromMaterial(ALLOY.MARAGING350);
 			
-			MaterialGenerator.generateItemsFromMaterial(ALLOY.STELLITE);
-			MaterialGenerator.generateItemsFromMaterial(ALLOY.TALONITE);
-
+			//Misc Alloys
+			new MaterialGenerator(ALLOY.ENERGYCRYSTAL);
+			new MaterialGenerator(ALLOY.BLOODSTEEL);
+			new MaterialGenerator(ALLOY.BEDROCKIUM);
+			new MaterialGenerator(ALLOY.ZERON_100);
 			//Tumbaga was the name given by Spaniards to a non-specific alloy of gold and copper 
-			MaterialGenerator.generateItemsFromMaterial(ALLOY.TUMBAGA);
+			new MaterialGenerator(ALLOY.TUMBAGA);
 			//Potin is traditionally an alloy of bronze, tin and lead, with varying quantities of each possible
-			MaterialGenerator.generateItemsFromMaterial(ALLOY.POTIN);
+			new MaterialGenerator(ALLOY.POTIN);
+			
+			//Staballoy & Tantalloy
+			new MaterialGenerator(ALLOY.STABALLOY);
+			new MaterialGenerator(ALLOY.TANTALLOY_60);
+			new MaterialGenerator(ALLOY.TANTALLOY_61);
 
-			MaterialGenerator.generateItemsFromMaterial(ALLOY.HASTELLOY_W);
-			MaterialGenerator.generateItemsFromMaterial(ALLOY.HASTELLOY_X);
-			MaterialGenerator.generateItemsFromMaterial(ALLOY.HASTELLOY_C276);
-			MaterialGenerator.generateItemsFromMaterial(ALLOY.HASTELLOY_N);
+			//Inconel
+			new MaterialGenerator(ALLOY.INCONEL_625);
+			new MaterialGenerator(ALLOY.INCONEL_690);
+			new MaterialGenerator(ALLOY.INCONEL_792);
 
-			MaterialGenerator.generateItemsFromMaterial(ALLOY.INCOLOY_020);
-			MaterialGenerator.generateItemsFromMaterial(ALLOY.INCOLOY_DS);
-			MaterialGenerator.generateItemsFromMaterial(ALLOY.INCOLOY_MA956);
 			
-			//Leagrisium
-			MaterialGenerator.generateItemsFromMaterial(ALLOY.LEAGRISIUM);			
+			//Maraging Steel
+			new MaterialGenerator(ALLOY.MARAGING250);
+			new MaterialGenerator(ALLOY.MARAGING300);
+			new MaterialGenerator(ALLOY.MARAGING350);
+			
+			//Composite Alloys
+			new MaterialGenerator(ALLOY.STELLITE);
+			new MaterialGenerator(ALLOY.TALONITE);			
+
+			//Hastelloy
+			new MaterialGenerator(ALLOY.HASTELLOY_W);
+			new MaterialGenerator(ALLOY.HASTELLOY_X);
+			new MaterialGenerator(ALLOY.HASTELLOY_C276);
+			new MaterialGenerator(ALLOY.HASTELLOY_N);
+
+			//Incoloy
+			new MaterialGenerator(ALLOY.INCOLOY_020);
+			new MaterialGenerator(ALLOY.INCOLOY_DS);
+			new MaterialGenerator(ALLOY.INCOLOY_MA956);
 			
+			//Leagrisium
+			new MaterialGenerator(ALLOY.LEAGRISIUM);			
 			//Must be the final Alloy to Generate
-			MaterialGenerator.generateItemsFromMaterial(ALLOY.QUANTUM);			
+			new MaterialGenerator(ALLOY.QUANTUM);		
+			
 
 		} catch (Throwable r){
 			Utils.LOG_INFO("Failed to Generated a Material. "+r.getMessage());
diff --git a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
index 55014f5ee8..8d8f8bc846 100644
--- a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
+++ b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
@@ -39,6 +39,7 @@ public class MaterialGenerator implements Runnable {
 	}
 	
 
+	@SuppressWarnings("unused")
 	public static void generateItemsFromMaterial(final Material matInfo){	
 		String unlocalizedName = matInfo.getUnlocalizedName();
 		String materialName = matInfo.getLocalizedName();
@@ -96,12 +97,21 @@ public class MaterialGenerator implements Runnable {
 			temp = new BaseItemGear(matInfo);
 		}		
 	
-		//Add A jillion Recipes
-		RecipeGen_Plates.generateRecipes(matInfo);
+	
+        //Generate some Recipes
+       new RecipeGen_Plates(matInfo);
+       new RecipeGen_Extruder(matInfo);
+       new RecipeGen_ShapedCrafting(matInfo);
+       new RecipeGen_DustGeneration(matInfo);
+       new RecipeGen_BlastSmelter(matInfo);      
+		
+		
+		//Add A jillion Recipes - old code
+		/*RecipeGen_Plates.generateRecipes(matInfo);
 		RecipeGen_Extruder.generateRecipes(matInfo);
 		RecipeGen_ShapedCrafting.generateRecipes(matInfo);
 		RecipeGen_DustGeneration.generateRecipes(matInfo);
-		RecipeGen_BlastSmelter.generateARecipe(matInfo);		
+		RecipeGen_BlastSmelter.generateARecipe(matInfo);*/		
 	
 	}
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
index 2ee8fea9d4..2b3c23daf1 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
@@ -8,7 +8,7 @@ import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechItems;
 import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
 import gtPlusPlus.xmod.gregtech.loaders.Gregtech_Blocks;
 import gtPlusPlus.xmod.gregtech.loaders.ProcessingToolHeadChoocher;
-import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_BlastSmelter;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_BlastSmelterGT;
 import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechConduits;
 
 public class HANDLER_GT {
@@ -37,7 +37,7 @@ public class HANDLER_GT {
 		GregtechConduits.run();
 		new MetaGeneratedGregtechTools();
 		new ProcessingToolHeadChoocher().run();
-		RecipeGen_BlastSmelter.generateRecipes();
+		RecipeGen_BlastSmelterGT.generateRecipes();
 		
 	}
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java
index bfe077cc92..f0ebec9c67 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java
@@ -7,20 +7,31 @@ import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import net.minecraft.item.ItemStack;
 
-public class RecipeGen_Extruder {
+public class RecipeGen_Extruder implements Runnable{
 
-	public static void generateRecipes(Material material){
+	final Material toGenerate;
+	
+	public RecipeGen_Extruder(final Material M){
+		this.toGenerate = M;
+	}
+	
+	@Override
+	public void run() {
+		generateRecipes(toGenerate);		
+	}
+
+	public static void generateRecipes(final Material material){
 
-		int tVoltageMultiplier = material.getMeltingPointK() >= 2800 ? 64 : 16;
-		ItemStack itemIngot = material.getIngot(1);
-		ItemStack plate_Single = material.getPlate(1);
-		ItemStack itemGear = material.getGear(1);
+		final int tVoltageMultiplier = material.getMeltingPointK() >= 2800 ? 64 : 16;
+		final ItemStack itemIngot = material.getIngot(1);
+		final ItemStack plate_Single = material.getPlate(1);
+		final ItemStack itemGear = material.getGear(1);
 
-		ItemStack shape_Plate = ItemList.Shape_Extruder_Plate.get(0);
-		ItemStack shape_Ring = ItemList.Shape_Extruder_Ring.get(0);
-		ItemStack shape_Gear = ItemList.Shape_Extruder_Gear.get(0);
-		ItemStack shape_Rod = ItemList.Shape_Extruder_Rod.get(0);
-		ItemStack shape_Bolt = ItemList.Shape_Extruder_Bolt.get(0);
+		final ItemStack shape_Plate = ItemList.Shape_Extruder_Plate.get(0);
+		final ItemStack shape_Ring = ItemList.Shape_Extruder_Ring.get(0);
+		final ItemStack shape_Gear = ItemList.Shape_Extruder_Gear.get(0);
+		final ItemStack shape_Rod = ItemList.Shape_Extruder_Rod.get(0);
+		final ItemStack shape_Bolt = ItemList.Shape_Extruder_Bolt.get(0);
 
 		Utils.LOG_WARNING("Generating Extruder recipes for "+material.getLocalizedName());