+ Started adding recipes for the chemicals added earlier.

+ Added a framework for a Catalytic Reactor.
$ Fixed FFPP recipes.
$ Finally fixed #56. Textures from GT++ now have their own array to prevent GT Texture overlap issues.

1 files changed, 115 insertions, 78 deletions

diff --git a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
index 62ae054ff3..1ad37b1c56 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
@@ -1,15 +1,12 @@
 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.enums.*;
 import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.common.GT_Proxy;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.fluid.FluidUtils;
 import gtPlusPlus.core.util.item.ItemUtils;
+import net.minecraft.item.ItemStack;
 
 public class CoalTar {
 
@@ -24,14 +21,14 @@ public class CoalTar {
 		//Create Ethylbenzene - Ethylbenzene is produced in on a large scale by combining benzene and ethylene in an acid-catalyzed chemical reaction
 		//Use Chemical Reactor
 		FluidUtils.generateFluidNonMolten("Ethylbenzene", "Ethylbenzene", 136, new short[]{255, 255, 255, 100}, null, null);
-		
-		
+
+
 
 		//Create Anthracene
 		FluidUtils.generateFluidNonMolten("Anthracene", "Anthracene", 340, new short[]{255, 255, 255, 100}, null, null);
-		
-		
-		
+
+
+
 		//Create Coal Tar
 		FluidUtils.generateFluidNonMolten("CoalTar", "Coal Tar", 450, new short[]{32, 32, 32, 100}, null, null);
 		// v - Distill (60% Tar oil/15% Naphtha/20% Ethylbenzene/5% Anthracene)
@@ -49,8 +46,8 @@ public class CoalTar {
 		// v - Dehydrate at 180C+
 		//Create Phthalic Anhydride
 		ItemUtils.generateSpecialUseDusts("PhthalicAnhydride", "Phthalic Anhydride", Utils.rgbtoHexValue(175, 175, 175));
-		
-		
+
+
 
 		//Create 2-Ethylanthraquinone
 		//2-Ethylanthraquinone is prepared from the reaction of phthalic anhydride and ethylbenzene
@@ -61,80 +58,120 @@ public class CoalTar {
 		//Create Hydrogen Peroxide
 		//Compressed Air(1500) + Ethylanthrahydroquinone(500) + Anthracene(5) = 450 Ethylanthraquinone && 200 Peroxide
 		FluidUtils.generateFluidNonMolten("HydrogenPeroxide", "Hydrogen Peroxide", 150, new short[]{210, 255, 255, 100}, null, null);
-		
-		
-		
+
+
+
 		//Lithium Hydroperoxide - LiOH + H2O2 → LiOOH + 2 H2O
 		ItemUtils.generateSpecialUseDusts("LithiumHydroperoxide", "Lithium Hydroperoxide", Utils.rgbtoHexValue(125, 125, 125));
 		// v - Dehydrate
 		//Lithium Peroxide - 2 LiOOH → Li2O2 + H2O2 + 2 H2O
 		FluidUtils.generateFluidNonMolten("LithiumPeroxide", "Lithium Peroxide", 446, new short[]{135, 135, 135, 100}, null, null);
+
+		createRecipes();
 		
+
+	}
+
+	private static void createRecipes() {
+		recipeCreateEthylene();
+		recipeCreatebenzene();
+		recipeCreateEthylbenzene();
 		
-		
-		
-		
-		
-		//Pyrolyse
-		//Lignite Coal
-		GT_Values.RA.addPyrolyseRecipe(
-				GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Lignite, 16L), //Input 1
-				GT_Values.NF, //Fluid Input
-				8,
-				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDarkAsh", 2), //Item Output
-				FluidUtils.getFluidStack("fluid.coaltar", 800), //Fluid Output
-				150*20,
-				120);
-		//Coal
-		GT_Values.RA.addPyrolyseRecipe(
-				GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 16L), //Input 1
-				GT_Values.NF, //Fluid Input
-				8,
-				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDarkAsh", 2), //Item Output
-				FluidUtils.getFluidStack("fluid.coaltar", 2200), //Fluid Output
+		recipeCoalToCoalTar();
+	}
+
+	public static void recipeCreateEthylene(){
+		CORE.RA.addDehydratorRecipe(
+				ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2),
+				FluidUtils.getFluidStack("fluid.bioethanol", 2000),
+				new ItemStack[]{
+						ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 1)
+				},
+				120*20,
+				80);
+		
+		CORE.RA.addDehydratorRecipe(
+				ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2),
+				FluidUtils.getFluidStack("bioethanol", 2000),
+				new ItemStack[]{
+						ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 1)
+				},
 				120*20,
-				240);
-		//Coal Coke
-		GT_Values.RA.addPyrolyseRecipe(
-				ItemUtils.getItemStack("Railcraft:fuel.coke", 16), //Input 1
-				GT_Values.NF, //Fluid Input
-				8,
-				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallAsh", 3), //Item Output
-				FluidUtils.getFluidStack("fluid.coaltar", 3400), //Fluid Output
-				100*20,
-				360);
-
-		//Coke Oven
-		//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("fluid.coaltar", 800), //Fluid Output
-				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDarkAsh", 2), //Item Output
-				150*10,  //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("fluid.coaltar", 2200), //Fluid Output
-				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDarkAsh", 2), //Item Output
-				120*10,  //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("fluid.coaltar", 3400), //Fluid Output
-				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallAsh", 3), //Item Output
-				120*10,  //Time in ticks
-				360); //EU
-		 
+				80);
+	}
+
+	public static void recipeCreatebenzene(){
+
+	}
+
+	public static void recipeCreateEthylbenzene(){
+		//GT_Values.RA.addChemicalRecipe(arg0, arg1, arg2, arg3)
 	}
 
+
+	public static void recipeCoalToCoalTar(){
+		//Pyrolyse
+				//Lignite Coal
+				GT_Values.RA.addPyrolyseRecipe(
+						GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Lignite, 16L), //Input 1
+						GT_Values.NF, //Fluid Input
+						8,
+						ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDarkAsh", 2), //Item Output
+						FluidUtils.getFluidStack("fluid.coaltar", 800), //Fluid Output
+						150*20,
+						120);
+				//Coal
+				GT_Values.RA.addPyrolyseRecipe(
+						GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 16L), //Input 1
+						GT_Values.NF, //Fluid Input
+						8,
+						ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDarkAsh", 2), //Item Output
+						FluidUtils.getFluidStack("fluid.coaltar", 2200), //Fluid Output
+						120*20,
+						240);
+				//Coal Coke
+				GT_Values.RA.addPyrolyseRecipe(
+						ItemUtils.getItemStack("Railcraft:fuel.coke", 16), //Input 1
+						GT_Values.NF, //Fluid Input
+						8,
+						ItemUtils.getItemStackOfAmountFromOreDict("dustSmallAsh", 3), //Item Output
+						FluidUtils.getFluidStack("fluid.coaltar", 3400), //Fluid Output
+						100*20,
+						360);
+
+				//Coke Oven
+				//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("fluid.coaltar", 800), //Fluid Output
+						ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDarkAsh", 2), //Item Output
+						150*10,  //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("fluid.coaltar", 2200), //Fluid Output
+						ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDarkAsh", 2), //Item Output
+						120*10,  //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("fluid.coaltar", 3400), //Fluid Output
+						ItemUtils.getItemStackOfAmountFromOreDict("dustSmallAsh", 3), //Item Output
+						120*10,  //Time in ticks
+						360); //EU
+	}
+
+
 }