+ Added cells for all my molten materials. (This also regenerates all the molten fluids)

+ Added most recipes for my alloys to the Blast Smelter. (overlaps which will need to be adjusted again. (Zeron, Hastelloy X/W, MS 300/350))
% Rewrote the fluid system again.

> Cell textures are a WIP, Ugly, but will be changed before v1.5.0

2 files changed, 59 insertions, 31 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
index 4c5606b125..1e69288e8e 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
@@ -1,30 +1,25 @@
 package gtPlusPlus.xmod.gregtech.loaders;
 
-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;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.item.ItemUtils;
-import gtPlusPlus.core.util.recipe.RecipeUtils;
 import net.minecraft.item.ItemStack;
 
 public class RecipeGen_BlastSmelter {
 
 	public static void generateRecipes(){
-
+/*
 		Materials[] GregMaterials = Materials.values();
 
 		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)
 					 || !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium)
-					 || !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium)*/
 					){
 
 
@@ -160,7 +155,7 @@ public class RecipeGen_BlastSmelter {
 					}
 				}
 			}
-		}
+		}*/
 	}
 
 
@@ -206,10 +201,29 @@ public class RecipeGen_BlastSmelter {
 
 			//Generate Recipes for all singular materials that can be made molten.
 			if (M.requiresBlastFurnace()) {
-				CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getMolten(fluidAmount), 100, duration, 240);
+				
+				if (M.getFluid(10) == null){
+					Utils.LOG_INFO("Material Fluid was Null. Why you lie gaem.");
+				}
+				else {
+					Utils.LOG_INFO("Material Fluid: "+M.getFluid(10).getFluid().getName());
+					
+				}
+				
+				if (CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getFluid(fluidAmount), 100, duration, 240)){
+					Utils.LOG_INFO("Success.");
+				}
+				else {
+					Utils.LOG_INFO("Failed.");
+				}
 			}
 			else {
-				CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getMolten(fluidAmount), 100, duration/2, 120);					
+				if (CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getFluid(fluidAmount), 100, duration/2, 120)){
+					Utils.LOG_INFO("Success.");
+				}	
+				else {
+					Utils.LOG_INFO("Failed.");
+				}				
 			}
 
 			if (tMaterial != null){
@@ -263,10 +277,20 @@ public class RecipeGen_BlastSmelter {
 								Utils.LOG_INFO("tMaterial["+das+"]: "+components[das].getDisplayName()+" Meta: "+components[das].getItemDamage()+", Amount: "+components[das].stackSize);
 						}
 						if (M.requiresBlastFurnace()) {
-							CORE.RA.addBlastSmelterRecipe(components, M.getMolten(fluidAmount), 100, duration, 500);							
+							if (CORE.RA.addBlastSmelterRecipe(components, M.getFluid(fluidAmount), 100, duration, 500)){
+								Utils.LOG_INFO("Success.");
+							}
+							else {
+								Utils.LOG_INFO("Failed.");
+							}
 						}
 						else {
-							CORE.RA.addBlastSmelterRecipe(components, M.getMolten(fluidAmount), 100, duration, 240);							
+							if (CORE.RA.addBlastSmelterRecipe(components, M.getFluid(fluidAmount), 100, duration, 240)){
+								Utils.LOG_INFO("Success.");
+							}	
+							else {
+								Utils.LOG_INFO("Failed.");
+							}						
 						}
 					}
 				}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
index 804d226f67..a9ab14fdf6 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
@@ -77,26 +77,30 @@ public class RecipeGen_ShapedCrafting {
 
 
 		//Add a shapeless recipe for each dust this way - Compat mode.
-		ItemStack[] shapelessInput = new ItemStack[material.getMaterialComposites().length];
-		int arrayLocation=0;
-		if (shapelessInput.length > 1){
-			for (ItemStack I : material.getMaterialComposites()){
-				if (I != null && material.vSmallestRatio != null){
-					shapelessInput[arrayLocation] = I;
-					shapelessInput[arrayLocation].stackSize = (int) material.vSmallestRatio[arrayLocation];
+		/*ItemStack[] inputStacks = material.getMaterialComposites();
+		ItemStack outputStacks = material.getDust(material.smallestStackSizeWhenProcessing);
+		
+		if (inputStacks.length > 0){
+			Utils.LOG_INFO(ItemUtils.getArrayStackNames(inputStacks));
+			long[] inputStackSize = material.vSmallestRatio;
+			if (inputStackSize != null){
+				for (short x=0;x<inputStacks.length;x++){
+					if (inputStacks[x] != null && inputStackSize[x] != 0)
+					inputStacks[x].stackSize = (int) inputStackSize[x];
+				}
+				Utils.LOG_INFO(ItemUtils.getArrayStackNames(inputStacks));			
+				if (RecipeUtils.buildShapelessRecipe(
+						outputStacks, 
+						inputStacks
+						)){
+					Utils.LOG_INFO("Shapeless Crafting Recipe: "+material.getLocalizedName()+" - Success");
+				}
+				else {
+					Utils.LOG_INFO("Shapeless Crafting Recipe: "+material.getLocalizedName()+" - Failed");			
 				}
 			}
-			if (RecipeUtils.buildShapelessRecipe(
-					material.getDust(material.smallestStackSizeWhenProcessing), 
-					shapelessInput
-					)){
-				Utils.LOG_INFO("Shapeless Recipe: "+material.getLocalizedName()+" - Success");
-			}
-			else {
-				Utils.LOG_INFO("Shapeless Recipe: "+material.getLocalizedName()+" - Failed");			
-			}
-		}
-
+		}*/			
+		
 
 		//Shaped Recipe - Bolts
 		if (!material.isRadioactive){