+ Added Coal Tar.

+ Added Coal Tar Recipes.
- Removed some bad debugging from the Coke Oven.
$ Disabled a check in the fluid generator which in rare cases caused them not to be created.

4 files changed, 89 insertions, 8 deletions

diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index a4373333d8..6b85e90d08 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -19,6 +19,7 @@ import gtPlusPlus.core.item.base.misc.BaseItemMisc;
 import gtPlusPlus.core.item.base.misc.BaseItemMisc.MiscTypes;
 import gtPlusPlus.core.item.base.plates.BaseItemPlate;
 import gtPlusPlus.core.item.base.plates.BaseItemPlateDouble;
+import gtPlusPlus.core.item.chemistry.CoalTar;
 import gtPlusPlus.core.item.effects.RarityUncommon;
 import gtPlusPlus.core.item.general.*;
 import gtPlusPlus.core.item.general.chassis.*;
@@ -545,6 +546,9 @@ public final class ModItems {
 		itemDehydratorCoil = new itemDehydratorCoil();
 		
 		itemAirFilter = new ItemAirFilter();
+		
+		//Chemistry
+		CoalTar.run();
 
 		//Misc Items
 		Item tI;
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
new file mode 100644
index 0000000000..5cf4bc96d3
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
@@ -0,0 +1,77 @@
+package gtPlusPlus.core.item.chemistry;
+
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.common.GT_Proxy;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.fluid.FluidUtils;
+import gtPlusPlus.core.util.item.ItemUtils;
+
+public class CoalTar {
+
+	public static void run(){
+
+		//Create Coal Tar
+		FluidUtils.generateFluidNonMolten("CoalTar", "Coal Tar", 450, new short[]{32, 32, 32, 100}, null, null);
+
+		//Create Coal Tar From Coal
+		CORE.RA.addCokeOvenRecipe(
+				GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Lignite, 16L), //Input 1
+				GT_Values.NI, //Input 2
+				GT_Values.NF, //Fluid Input
+				FluidUtils.getFluidStack("coaltar", 800), //Fluid Output
+				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDarkAsh", 2), //Item Output
+				150*20,  //Time in ticks
+				120); //EU
+
+		//Create Coal Tar From Coal
+		CORE.RA.addCokeOvenRecipe(
+				GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 16L), //Input 1
+				GT_Values.NI, //Input 2
+				GT_Values.NF, //Fluid Input
+				FluidUtils.getFluidStack("coaltar", 2200), //Fluid Output
+				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDarkAsh", 2), //Item Output
+				120*20,  //Time in ticks
+				240); //EU
+
+		//Create Coal Tar From Coal
+		CORE.RA.addCokeOvenRecipe(
+				ItemUtils.getItemStack("Railcraft:fuel.coke", 16), //Input 1
+				GT_Values.NI, //Input 2
+				GT_Values.NF, //Fluid Input
+				FluidUtils.getFluidStack("coaltar", 3400), //Fluid Output
+				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallAsh", 3), //Item Output
+				120*20,  //Time in ticks
+				360); //EU
+
+
+		/*//Create Coal Tar From Coal
+		GT_Values.RA.addBlastRecipe(
+				ItemUtils.getItemStackOfAmountFromOreDict("gemCoal", 16),
+				GT_Values.NI,
+				GT_Values.NF,
+				FluidUtils.getFluidStack("coaltar", 2200),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDarkAsh", 2),
+				GT_Values.NI,
+				120*20,
+				240, //EU
+				2700); //Heat
+
+		//Create Coal Tar From Coal
+		GT_Values.RA.addBlastRecipe(
+				ItemUtils.getItemStackOfAmountFromOreDict("gemCoke", 16),
+				GT_Values.NI,
+				GT_Values.NF,
+				FluidUtils.getFluidStack("coaltar", 3400),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallAsh", 3),
+				GT_Values.NI,
+				120*20,
+				360, //EU
+				3100); //Heat
+*/
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
index 882f3f1eb4..aa44c24440 100644
--- a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
+++ b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
@@ -432,7 +432,7 @@ public class FluidUtils {
 		if (dustStack == null){
 			dustStack = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dust"+Utils.sanitizeString(localizedName), 1);
 		}
-		if ((FluidUtils.getFluidStack(unlocalizedName.toLowerCase(), 1) == null) && ((dustStack != null) || (dustStack2 != null))){
+		if ((FluidUtils.getFluidStack(unlocalizedName.toLowerCase(), 1) == null)/* && ((dustStack != null) || (dustStack2 != null))*/){
 			Utils.LOG_WARNING("Generating our own fluid.");
 
 			//Generate a Cell if we need to
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
index 47a2d7eaaa..993cd506ec 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
@@ -22,39 +22,39 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
 			try {
 				RECIPEHANDLER_CokeOven.debug1();
 				if (((aInput1 == null) /*&& (aFluidInput == null)*/) || ((aOutput == null) || (aFluidOutput == null))) {
-					Utils.LOG_WARNING("aInput1:"+aInput1.toString()+" aInput2:"+aInput2.toString()+" aFluidInput:"+aFluidInput.toString()+" aFluidOutput:"+aFluidOutput.toString()+" aOutput:"+aOutput.toString()+" aDuration:"+aDuration+" aEU/t:"+aEUt);
+					//Utils.LOG_WARNING("aInput1:"+aInput1.toString()+" aInput2:"+aInput2.toString()+" aFluidInput:"+aFluidInput.toString()+" aFluidOutput:"+aFluidOutput.toString()+" aOutput:"+aOutput.toString()+" aDuration:"+aDuration+" aEU/t:"+aEUt);
 					Utils.LOG_WARNING("Something was null, returning false");
 					return false;
 				}
 
 			} catch (final NullPointerException e){e.getStackTrace();}
 			try {
-				RECIPEHANDLER_CokeOven.debug2(aInput1, aInput2, aFluidInput, aFluidOutput, aOutput, aDuration, aEUt);
+				//RECIPEHANDLER_CokeOven.debug2(aInput1, aInput2, aFluidInput, aFluidOutput, aOutput, aDuration, aEUt);
 				if ((aOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get("cokeoven", aOutput, aDuration)) <= 0)) {
-					Utils.LOG_WARNING("aInput1:"+aInput1.toString()+" aInput2:"+aInput2.toString()+" aFluidInput:"+aFluidInput.toString()+" aFluidOutput:"+aFluidOutput.toString()+" aOutput:"+aOutput.toString()+" aDuration:"+aDuration+" aEU/t:"+aEUt);
+					//Utils.LOG_WARNING("aInput1:"+aInput1.toString()+" aInput2:"+aInput2.toString()+" aFluidInput:"+aFluidInput.toString()+" aFluidOutput:"+aFluidOutput.toString()+" aOutput:"+aOutput.toString()+" aDuration:"+aDuration+" aEU/t:"+aEUt);
 					Utils.LOG_WARNING("Something was null, returning false");
 					return false;
 				}
 
 			} catch (final NullPointerException e){e.getStackTrace();}
 			try {
-				RECIPEHANDLER_CokeOven.debug3(aInput1, aInput2, aFluidInput, aFluidOutput, aOutput, aDuration, aEUt);
+				//RECIPEHANDLER_CokeOven.debug3(aInput1, aInput2, aFluidInput, aFluidOutput, aOutput, aDuration, aEUt);
 				if ((aFluidOutput == null) && ((aDuration = GregTech_API.sRecipeFile.get("cokeoven", aFluidOutput.getFluid().getName(), aDuration)) <= 0)) {
-					Utils.LOG_WARNING("aInput1:"+aInput1.toString()+" aInput2:"+aInput2.toString()+" aFluidInput:"+aFluidInput.toString()+" aFluidOutput:"+aFluidOutput.toString()+" aOutput:"+aOutput.toString()+" aDuration:"+aDuration+" aEU/t:"+aEUt);
+					//Utils.LOG_WARNING("aInput1:"+aInput1.toString()+" aInput2:"+aInput2.toString()+" aFluidInput:"+aFluidInput.toString()+" aFluidOutput:"+aFluidOutput.toString()+" aOutput:"+aOutput.toString()+" aDuration:"+aDuration+" aEU/t:"+aEUt);
 					Utils.LOG_WARNING("Something was null, returning false");
 					return false;
 				}
 
 			} catch (final NullPointerException e){e.getStackTrace();}
 			try {
-				RECIPEHANDLER_CokeOven.debug4(aInput1, aInput2, aFluidInput, aFluidOutput, aOutput, aDuration, aEUt);
+				//RECIPEHANDLER_CokeOven.debug4(aInput1, aInput2, aFluidInput, aFluidOutput, aOutput, aDuration, aEUt);
 				if (aFluidInput == null){
 					Recipe_GT.Gregtech_Recipe_Map.sCokeOvenRecipes.addRecipe(true, new ItemStack[]{aInput1, aInput2}, new ItemStack[]{aOutput}, null, null, null, new FluidStack[]{aFluidOutput}, aDuration, aEUt, 0);
 				}
 				else {
 					Recipe_GT.Gregtech_Recipe_Map.sCokeOvenRecipes.addRecipe(true, new ItemStack[]{aInput1, aInput2}, new ItemStack[]{aOutput}, null, null, new FluidStack[]{aFluidInput}, new FluidStack[]{aFluidOutput}, aDuration, aEUt, 0);
 				}
-				RECIPEHANDLER_CokeOven.debug5(aInput1, aInput2, aFluidInput, aFluidOutput, aOutput, aDuration, aEUt);
+				//RECIPEHANDLER_CokeOven.debug5(aInput1, aInput2, aFluidInput, aFluidOutput, aOutput, aDuration, aEUt);
 
 				return true;