+ Started working on the Coal Tar recipes again.

+ Added recipes for Coal Tar Oil, Naphtha, Ethylbenzene and Anthracene.

2 files changed, 58 insertions, 2 deletions

diff --git a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
index dd2c1989a9..741cfcc42d 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
@@ -9,6 +9,7 @@ import gtPlusPlus.core.util.fluid.FluidUtils;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.reflect.AddGregtechRecipe;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
 
 public class CoalTar {
 
@@ -92,6 +93,61 @@ public class CoalTar {
 		recipeCreateEthylbenzene();
 
 		recipeCoalToCoalTar();
+		recipeCoalTarToCoalTarOil();
+	}
+
+	private static void recipeCoalTarToCoalTarOil() {
+		// v - Distill (60% Tar oil/15% Naphtha/20% Ethylbenzene/5% Anthracene)
+		//Create Coal Tar Oil
+		//FluidUtils.generateFluidNonMolten("CoalTarOil", "Coal Tar Oil", 240, new short[]{240, 240, 150, 100}, null, null);
+		GT_Values.RA.addDistilleryRecipe(
+				1, //Circuit
+				FluidUtils.getFluidStack("fluid.coaltar", 1000), //aInput
+				FluidUtils.getFluidStack("fluid.coaltaroil", 600), //aOutput
+				null, //aSolidOutput
+				600, //aDuration
+				64,//aEUt
+				false //Hidden?
+				);	
+		GT_Values.RA.addDistilleryRecipe(
+				2, //Circuit
+				FluidUtils.getFluidStack("fluid.coaltar", 1000), //aInput
+				FluidUtils.getFluidStack("liquid_naphtha", 150), //aOutput
+				null, //aSolidOutput
+				300, //aDuration
+				30,//aEUt
+				false //Hidden?
+				);
+		GT_Values.RA.addDistilleryRecipe(
+				3, //Circuit
+				FluidUtils.getFluidStack("fluid.coaltar", 1000), //aInput
+				FluidUtils.getFluidStack("fluid.ethylbenzene", 200), //aOutput
+				null, //aSolidOutput
+				450, //aDuration
+				86,//aEUt
+				false //Hidden?
+				);
+		GT_Values.RA.addDistilleryRecipe(
+				4, //Circuit
+				FluidUtils.getFluidStack("fluid.coaltar", 1000), //aInput
+				FluidUtils.getFluidStack("fluid.anthracene", 50), //aOutput
+				null, //aSolidOutput
+				900, //aDuration
+				30,//aEUt
+				false //Hidden?
+				);
+		GT_Values.RA.addDistillationTowerRecipe(
+				FluidUtils.getFluidStack("fluid.coaltar", 1000),
+				new FluidStack[]{
+						FluidUtils.getFluidStack("fluid.coaltaroil", 600), //aOutput
+						FluidUtils.getFluidStack("liquid_naphtha", 150), //aOutput
+						FluidUtils.getFluidStack("fluid.ethylbenzene", 200), //aOutput
+						FluidUtils.getFluidStack("fluid.anthracene", 50), //aOutput
+				},
+				null,
+				900,
+				60);
+		
 	}
 
 	public static void recipeCreateEthylene(){
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_PowerSubStationController.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_PowerSubStationController.java
index 5fe0522b0a..5f95a28321 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_PowerSubStationController.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_PowerSubStationController.java
@@ -244,8 +244,8 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GT_MetaTil
 			Utils.LOG_MACHINE_INFO("Returned False 3");
 			Utils.LOG_MACHINE_INFO("Input Buses: "+this.mInputBusses.size()+" | expected: 1 | "+(this.mInputBusses.size() != 1));
 			Utils.LOG_MACHINE_INFO("Output Buses: "+this.mOutputBusses.size()+" | expected: 1 | "+(this.mOutputBusses.size() != 1));
-			Utils.LOG_MACHINE_INFO("Energy Hatches: "+this.mEnergyHatches.size()+" | expected: < 1 | "+(this.mEnergyHatches.size() < 1));
-			Utils.LOG_MACHINE_INFO("Dynamo Hatches: "+this.mDynamoHatches.size()+" | expected: < 1 | "+(this.mDynamoHatches.size() < 1));
+			Utils.LOG_MACHINE_INFO("Energy Hatches: "+this.mEnergyHatches.size()+" | expected: >= 1 | "+(this.mEnergyHatches.size() < 1));
+			Utils.LOG_MACHINE_INFO("Dynamo Hatches: "+this.mDynamoHatches.size()+" | expected: >= 1 | "+(this.mDynamoHatches.size() < 1));
 			Utils.LOG_MACHINE_INFO("Maint. Hatches: "+this.mMaintenanceHatches.size()+" | expected: 1 | "+(this.mMaintenanceHatches.size() != 1));
 			return false;
 		}