Merge pull request #525 from alkcorp/DevTop

+ 6 Months of work, let's get the ball rolling.

1 files changed, 202 insertions, 33 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java
index 7bc0eacd4f..40994040bd 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java
@@ -1,61 +1,230 @@
 package gtPlusPlus.xmod.gregtech.loaders;
 
 import java.util.HashSet;
-import java.util.Set;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.util.GT_Recipe;
-
+import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
+import gregtech.api.util.Recipe_GT;
 import gtPlusPlus.api.interfaces.RunnableWithInfo;
-import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.material.MaterialGenerator;
-
-public class RecipeGen_FluidCanning extends RecipeGen_Base {
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
 
-	public final static Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>();
-	static {
-		MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap);
+public class RecipeGen_FluidCanning implements Runnable {
+	
+	public static void init() {
+		FluidCanningRunnableHandler x = new FluidCanningRunnableHandler();
+		x.run();
 	}
 
+	private static class FluidCanningRunnableHandler implements RunnableWithInfo<String> {
+		
+		@Override
+		public void run() {
+			mHasRun = true;
+			for (RecipeGen_FluidCanning aRecipe : mCache) {
+				aRecipe.run();
+			}			
+		}
+
+		@Override
+		public String getInfoData() {
+			return "Fluid Canning Recipes";
+		}		
+	}
+	
+	private static boolean mHasRun = false;
+	
+	private static HashSet<RecipeGen_FluidCanning> mCache = new HashSet<RecipeGen_FluidCanning>();
+	
+	private static void addRunnableToRecipeCache(RecipeGen_FluidCanning r) {
+		if (mHasRun) {
+			CORE.crash();
+		}
+		mCache.add(r);
+	}
+	
+	protected boolean disableOptional;
+	
 	private final GT_Recipe recipe;
-	public RecipeGen_FluidCanning(GT_Recipe g) {
-		this(g, true);
+	private final boolean isValid;
+
+	public boolean valid() {
+		return isValid;
+	}
+	public RecipeGen_FluidCanning(boolean aExtracting, ItemStack aEmpty, ItemStack aFull, FluidStack aFluid) {
+		this(aExtracting, aEmpty, aFull, aFluid, GT_Values.NF, null, null);
+	}
+
+	public RecipeGen_FluidCanning(boolean aExtracting, ItemStack aEmpty, ItemStack aFull, FluidStack aFluidIn, FluidStack aFluidOut) {
+		this(aExtracting, aEmpty, aFull, aFluidIn, aFluidOut, null, null);
 	}
-	public RecipeGen_FluidCanning(GT_Recipe g, boolean extracting) {
-		recipe = g;
-		mRecipeGenMap.add(this);
-		disableOptional = extracting;
+
+	public RecipeGen_FluidCanning(boolean aExtracting, ItemStack aEmpty, ItemStack aFull, FluidStack aFluid, Integer aDuration, Integer aEUt) {
+		this(aExtracting, aEmpty, aFull, aFluid, GT_Values.NF, aDuration, aEUt);
+	}
+
+	// Alternative Constructor
+	public RecipeGen_FluidCanning(boolean aExtracting, ItemStack aEmpty, ItemStack aFull, FluidStack aFluidIn, FluidStack aFluidOut, Integer aDuration, Integer aEUt) {
+		ItemStack aInput;
+		ItemStack aOutput;
+		FluidStack aFluidInput;
+		FluidStack aFluidOutput;
+
+		// Safety check on the duration
+		if (aDuration == null || aDuration <= 0) {
+			aDuration = (aFluidIn != null) ? (aFluidIn.amount / 62) : ((aFluidOut != null) ? (aFluidOut.amount / 62) : 10);
+		}
+
+		// Safety check on the EU
+		if (aEUt == null || aEUt <= 0) {
+			if (aExtracting) {
+				aEUt = 2;
+			}
+			else {
+				aEUt = 1;
+			}
+		}
+
+		// Set Item stacks correctly, invert if extraction recipe.
+		if (aExtracting) {
+			aInput = aFull;
+			aOutput = aEmpty;
+			aFluidInput = GT_Values.NF;
+			aFluidOutput = aFluidIn;			
+		}
+		else {
+			aInput = aEmpty;
+			aOutput = aFull;		
+			aFluidInput = aFluidIn;
+			aFluidOutput = aFluidOut != null ? aFluidOut : GT_Values.NF;			
+		}
+
+		//Check validity
+
+		Recipe_GT aRecipe = new Recipe_GT(
+				true,
+				new ItemStack[] { aInput },
+				new ItemStack[] { aOutput },
+				null,
+				new int[] {10000},
+				new FluidStack[] { aFluidInput },
+				new FluidStack[] { aFluidOutput },
+				aDuration,
+				aEUt,
+				0);
+
+
+		// Check Valid		
+		boolean aTempValidityCheck = false;
+		//Logger.INFO("Validity Check.");
+		if (aExtracting) {
+			Logger.INFO("Extracting.");
+			if (aInput != null && aFluidOutput != null) {
+				//Logger.INFO("Pass.");
+				aTempValidityCheck = true;
+			}
+		}
+		else {
+			//Logger.INFO("Canning.");
+			if (aInput != null && aOutput != null && (aFluidInput != null || aFluidOutput != null)) {
+				//Logger.INFO("Pass.");
+				aTempValidityCheck = true;				
+			}
+		}		
+
+
+		if (aTempValidityCheck) {
+			// Valid Recipe
+			recipe = aRecipe;
+			disableOptional = aExtracting;
+			isValid = true;	
+			//Logger.INFO("Passed Validity Check. Hash: "+recipe.hashCode());
+			//Logger.INFO("Mapped as: "+(disableOptional ? "Extracting" : "Canning"));
+			addRunnableToRecipeCache(this);		
+		}
+		else {
+			//Logger.INFO("Failed Validity Check.");
+			isValid = false;
+			disableOptional = aExtracting;
+			aRecipe.mEnabled = false;
+			aRecipe.mHidden = true;
+			recipe = null;
+		}
 	}
 
 	@Override
 	public void run() {
+		Logger.INFO("Processing Recipe with Hash: "+recipe.hashCode());
 		generateRecipes();
 	}
 
 	private void generateRecipes() {
-		if (recipe != null) {			
-			//Used to store Fluid extraction state
+		if (isValid && recipe != null) {
+			//Logger.INFO("Processing "+(disableOptional ? "Extracting" : "Canning")+" Recipe.");
 			if (this.disableOptional) {
-				GT_Values.RA.addFluidExtractionRecipe(
-					recipe.mInputs.length >= 1 ? recipe.mInputs[0] : null, //Input
-					recipe.mInputs.length == 2 ? recipe.mInputs[1] : null, //Input 2
-					recipe.mFluidOutputs.length == 1 ? recipe.mFluidOutputs[0] : null, //Fluid Output
-					recipe.mSpecialValue, //Chance
-					recipe.mDuration, //Duration
-					recipe.mEUt //Eu Tick
-					);	
+				addFluidExtractionRecipe(recipe);	
 			}
 			else {
-				GT_Values.RA.addFluidCannerRecipe(
-					recipe.mInputs.length == 1 ? recipe.mInputs[0] : null, //Input
-					recipe.mOutputs.length == 1 ? recipe.mOutputs[0] : null, //Input 2
-					recipe.mFluidInputs.length == 1 ? recipe.mFluidInputs[0] : null, //Fluid Input
-					recipe.mFluidOutputs.length == 1 ? recipe.mFluidOutputs[0] : null //Fluid Output
-					);
-
+				addFluidCannerRecipe(recipe);
 			}
+		}
+	}
 
-		}		
+	private final boolean addFluidExtractionRecipe(GT_Recipe aRecipe) {
+		boolean result = false;	
+		int aCount1 = GT_Recipe_Map.sFluidExtractionRecipes.mRecipeList.size();
+		int aCount2 = aCount1;
+		GT_Recipe_Map.sFluidExtractionRecipes.addRecipe(aRecipe);
+		aCount1 = GT_Recipe_Map.sFluidExtractionRecipes.mRecipeList.size();
+		result = aCount1 > aCount2;
+		if (result) {
+			//Logger.INFO("[FIND] Added Extraction recipe for "+ItemUtils.getArrayStackNames(aRecipe.mInputs)+", "+ItemUtils.getArrayStackNames(aRecipe.mOutputs)+", "+ItemUtils.getArrayStackNames(aRecipe.mFluidInputs)+", "+ItemUtils.getArrayStackNames(aRecipe.mFluidOutputs));
+		}
+		else {
+			Logger.INFO("[ERROR] Failed adding Extraction recipe for "+ItemUtils.getArrayStackNames(aRecipe.mInputs)+", "+ItemUtils.getArrayStackNames(aRecipe.mOutputs)+", "+ItemUtils.getArrayStackNames(aRecipe.mFluidInputs)+", "+ItemUtils.getArrayStackNames(aRecipe.mFluidOutputs));
+			//dumpStack();
+		}
+		return result;
+	}
+
+	private final boolean addFluidCannerRecipe(GT_Recipe aRecipe) {
+		boolean result = false;
+		int aCount1 = GT_Recipe_Map.sFluidCannerRecipes.mRecipeList.size();
+		int aCount2 = aCount1;
+		GT_Recipe_Map.sFluidCannerRecipes.addRecipe(aRecipe);
+		aCount1 = GT_Recipe_Map.sFluidCannerRecipes.mRecipeList.size();
+		result = aCount1 > aCount2;
+		if (result) {
+			//Logger.INFO("[FIND] Added Canning recipe for "+ItemUtils.getArrayStackNames(aRecipe.mInputs)+", "+ItemUtils.getArrayStackNames(aRecipe.mOutputs)+", "+ItemUtils.getArrayStackNames(aRecipe.mFluidInputs)+", "+ItemUtils.getArrayStackNames(aRecipe.mFluidOutputs));
+		}
+		else {
+			Logger.INFO("[ERROR] Failed adding Canning recipe for "+ItemUtils.getArrayStackNames(aRecipe.mInputs)+", "+ItemUtils.getArrayStackNames(aRecipe.mOutputs)+", "+ItemUtils.getArrayStackNames(aRecipe.mFluidInputs)+", "+ItemUtils.getArrayStackNames(aRecipe.mFluidOutputs));
+			//dumpStack();
+		}
+		return result;
+	}
+
+	private void dumpStack() {
+		int parents = 2;
+		for (int i=0;i<6;i++) {
+			Logger.INFO((disableOptional ? "EXTRACTING" : "CANNING")+" DEBUG | "+(i == 0 ? "Called from: " : "Parent: ")+ReflectionUtils.getMethodName(i+parents));			
+		}
+
+	}
+
+	private String buildLogString() {
+		int solidSize = getMapSize(GT_Recipe_Map.sCannerRecipes);
+		int fluidSize = getMapSize(GT_Recipe_Map.sFluidCannerRecipes);		
+		return (disableOptional ? "EXTRACTING" : "CANNING")+" DEBUG | Solids: "+solidSize+" | Liquids: "+fluidSize+" | ";
+	}
+
+	private final int getMapSize(GT_Recipe_Map aMap) {
+		return aMap.mRecipeList.size();
 	}
 
 }