fix a bug

7 files changed, 1281 insertions, 269 deletions

diff --git a/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
new file mode 100644
index 0000000000..0c2bdaa3ef
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
@@ -0,0 +1,408 @@
+package gtPlusPlus.core.item.chemistry;
+
+import java.util.ArrayList;
+
+import forestry.plugins.PluginCore;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.Materials;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.minecraft.ItemPackage;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.recipe.common.CI;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.oredict.OreDictionary;
+
+public class AgriculturalChem extends ItemPackage {
+
+	private static boolean aBOP;
+	private static boolean aTiCon;
+
+	private static AutoMap<FluidStack> mBloodFluids = new AutoMap<FluidStack>();
+
+	/**
+	 * Fluids
+	 */
+
+	// Poop Juice
+	public static Fluid PoopJuice;
+	// Manure Slurry
+	public static Fluid ManureSlurry;
+	// Fertile Manure Slurry
+	public static Fluid FertileManureSlurry;
+	// Blood
+	public static Fluid CustomBlood;
+
+	/**
+	 * Items
+	 */
+
+	// Manure Byproducts
+	public static Item dustManureByproducts;
+	// Organic Fertilizer
+	public static Item dustOrganicFertilizer;
+	// Dirt
+	public static Item dustDirt;
+
+	// Poop Juice
+	// vv - Centrifuge
+	// Manure Slurry && Manure Byproducts -> (Elements) Centrifuge to several tiny
+	// piles
+	// vv - Chem Reactor - Add Peat, Meat
+	// Organic Fertilizer
+	// vv - Dehydrate
+	// Fertilizer
+
+	// Poop Juice
+	// vv - Mixer - Add Blood, Bone, Meat (1000L Poo, 200L Blood, x2 Bone, x3 Meat)
+	// Fertile Manure Slurry
+	// vv - Chem Reactor - Add Peat x1.5
+	// Organic Fertilizer x3
+	// vv - Dehydrate
+	// Fertilizer
+
+
+	@Override
+	public void items() {
+		// Nitrogen, Ammonium Nitrate, Phosphates, Calcium, Copper, Carbon
+		dustManureByproducts = ItemUtils.generateSpecialUseDusts("ManureByproducts", "Manure Byproduct",
+				"(N2H4O3)N2P2Ca3CuC8", Utils.rgbtoHexValue(110, 75, 25))[0];
+
+		// Basically Guano
+		dustOrganicFertilizer = ItemUtils.generateSpecialUseDusts("OrganicFertilizer", "Organic Fertilizer",
+				"Ca5(PO4)3(OH)", Utils.rgbtoHexValue(240, 240, 240))[0];
+
+		// Dirt Dust :)
+		dustDirt = ItemUtils.generateSpecialUseDusts("Dirt", "Dried Earth", Utils.rgbtoHexValue(65, 50, 15))[0];		
+	}
+
+	@Override
+	public void blocks() {
+		// None yet
+	}
+
+	@Override
+	public void fluids() {
+		// Sewage
+		PoopJuice = FluidUtils.generateFluidNonMolten("raw.waste", "Raw Animal Waste", 32 + 175,
+				new short[] { 100, 70, 30, 100 }, null, null, 0, true);
+
+		// Sewage
+		ManureSlurry = FluidUtils.generateFluidNonMolten("manure.slurry", "Manure Slurry", 39 + 175,
+				new short[] { 75, 45, 15, 100 }, null, null, 0, true);
+
+		// Sewage
+		FertileManureSlurry = FluidUtils.generateFluidNonMolten("fertile.manure.slurry", "Fertile Manure Slurry",
+				45 + 175, new short[] { 65, 50, 15, 100 }, null, null, 0, true);		
+	}
+	
+	
+
+	public AgriculturalChem() {
+		super();
+		
+		aBOP = LoadedMods.BiomesOPlenty;
+		aTiCon = LoadedMods.TiCon;
+
+		Logger.INFO("Adding Agrochemical content");
+
+		FluidStack aBlood;
+		if (aBOP) {
+			aBlood = FluidUtils.getFluidStack("hell_blood", 100);
+			if (aBlood != null) {
+				Logger.INFO("Found Biome's o Plenty, enabled Blood support.");
+				CustomBlood = aBlood.getFluid();
+				mBloodFluids.put(aBlood);
+			}
+		}
+
+		if (aTiCon) {
+			aBlood = FluidUtils.getFluidStack("hell_blood", 100);
+			if (aBlood != null) {
+				Logger.INFO("Found Tinker's Construct, enabled Blood support.");
+				CustomBlood = aBlood.getFluid();
+				mBloodFluids.put(FluidUtils.getFluidStack("blood", 100));
+			}
+		}
+
+		// Handle Blood Internally, Create if required.
+		if (mBloodFluids.isEmpty() || CustomBlood == null) {
+			Logger.INFO(
+					"Did not find any existing Blood fluids. Trying to wildcard search the fluid registry, then generate our own if that fails.");
+			FluidStack aTempBlood = FluidUtils.getWildcardFluidStack("blood", 100);
+			if (aTempBlood != null) {
+				CustomBlood = aTempBlood.getFluid();
+			} else {
+				aTempBlood = FluidUtils.getWildcardFluidStack("hell_blood", 100);
+				if (aTempBlood == null) {
+					CustomBlood = FluidUtils.generateFluidNoPrefix("blood", "Blood", 32 + 175,
+							new short[] { 175, 25, 25, 100 }, true);
+				} else {
+					CustomBlood = aTempBlood.getFluid();
+				}
+			}
+			Logger.INFO("Using " + CustomBlood.getName());
+			mBloodFluids.put(FluidUtils.getFluidStack(CustomBlood, 100));
+		}
+
+	}
+
+	private static AutoMap<ItemStack> mMeats = new AutoMap<ItemStack>();
+	private static AutoMap<ItemStack> mFish = new AutoMap<ItemStack>();
+	private static AutoMap<ItemStack> mFruits = new AutoMap<ItemStack>();
+	private static AutoMap<ItemStack> mVege = new AutoMap<ItemStack>();
+	private static AutoMap<ItemStack> mNuts = new AutoMap<ItemStack>();
+	private static AutoMap<ItemStack> mSeeds = new AutoMap<ItemStack>();
+	private static AutoMap<ItemStack> mPeat = new AutoMap<ItemStack>();
+	private static AutoMap<ItemStack> mBones = new AutoMap<ItemStack>();
+	private static AutoMap<ItemStack> mBoneMeal = new AutoMap<ItemStack>();
+
+	private static AutoMap<ItemStack> mList_Master_Meats = new AutoMap<ItemStack>();
+	private static AutoMap<ItemStack> mList_Master_FruitVege = new AutoMap<ItemStack>();
+	private static AutoMap<ItemStack> mList_Master_Bones = new AutoMap<ItemStack>();
+	private static AutoMap<ItemStack> mList_Master_Seeds = new AutoMap<ItemStack>();
+
+	private static void processAllOreDict() {
+		processOreDict("listAllmeatraw", mMeats);
+		processOreDict("listAllfishraw", mFish);
+		processOreDict("listAllfruit", mFruits);
+		processOreDict("listAllVeggie", mVege);
+		processOreDict("listAllnut", mNuts);
+		processOreDict("listAllSeed", mSeeds);
+		processOreDict("brickPeat", mPeat);
+		processOreDict("bone", mBones);
+		processOreDict("dustBone", mBoneMeal);
+		// Just make a mega list, makes life easier.
+		if (!mMeats.isEmpty()) {
+			for (ItemStack g : mMeats) {
+				mList_Master_Meats.put(g);
+			}
+		}
+		if (!mFish.isEmpty()) {
+			for (ItemStack g : mFish) {
+				mList_Master_Meats.put(g);
+			}
+		}
+		if (!mFruits.isEmpty()) {
+			for (ItemStack g : mFruits) {
+				mList_Master_FruitVege.put(g);
+			}
+		}
+		if (!mVege.isEmpty()) {
+			for (ItemStack g : mVege) {
+				mList_Master_FruitVege.put(g);
+			}
+		}
+		if (!mNuts.isEmpty()) {
+			for (ItemStack g : mNuts) {
+				mList_Master_FruitVege.put(g);
+			}
+		}
+		if (!mSeeds.isEmpty()) {
+			for (ItemStack g : mSeeds) {
+				mList_Master_Seeds.put(g);
+			}
+		}
+		if (!mBoneMeal.isEmpty()) {
+			for (ItemStack g : mBoneMeal) {
+				mList_Master_Bones.put(g);
+			}
+		}
+		if (!mBones.isEmpty()) {
+			for (ItemStack g : mBones) {
+				mList_Master_Bones.put(g);
+			}
+		}
+	}
+
+	private static void processOreDict(String aOreName, AutoMap<ItemStack> aMap) {
+		ArrayList<ItemStack> aTemp = OreDictionary.getOres(aOreName);
+		if (!aTemp.isEmpty()) {
+			for (ItemStack stack : aTemp) {
+				aMap.put(stack);
+			}
+		}
+	}
+
+	private static void addBasicSlurryRecipes() {
+
+		ItemStack aManureByprod1 = ItemUtils.getItemStackOfAmountFromOreDict("dustTinyManureByproducts", 1);
+		ItemStack aManureByprod2 = ItemUtils.getItemStackOfAmountFromOreDict("dustSmallManureByproducts", 1);
+		ItemStack aDirtDust = ItemUtils.getSimpleStack(dustDirt, 1);
+
+		// Poop Juice to Basic Slurry
+		GT_Values.RA.addCentrifugeRecipe(CI.getNumberedCircuit(10), null, FluidUtils.getFluidStack(PoopJuice, 1000), // In
+				// Fluid
+				FluidUtils.getFluidStack(ManureSlurry, 250), // Out Fluid
+				aDirtDust, aDirtDust, aManureByprod1, aManureByprod1, aManureByprod1, aManureByprod1,
+				new int[] { 2000, 2000, 500, 500, 250, 250 }, // Chances
+				10 * 20, // Time
+				30); // EU
+
+		// More Efficient way to get byproducts, less Slurry
+		GT_Values.RA.addCentrifugeRecipe(CI.getNumberedCircuit(20), null, FluidUtils.getFluidStack(PoopJuice, 1000), // In
+				// Fluid
+				FluidUtils.getFluidStack(ManureSlurry, 50), // Out Fluid
+				aDirtDust, aDirtDust, aManureByprod1, aManureByprod1, aManureByprod2, aManureByprod2,
+				new int[] { 4000, 3000, 1250, 1250, 675, 675 }, // Chances
+				20 * 20, // Time
+				60); // EU
+
+	}
+
+	private static void addAdvancedSlurryRecipes() {
+
+		ItemStack aCircuit = CI.getNumberedCircuit(10);
+		ItemStack aBone;
+		ItemStack aMeat;
+		ItemStack aEmptyCells = CI.emptyCells(2);
+		ItemStack aInputCells = ItemUtils.getItemStackOfAmountFromOreDict("cellRawWaste", 2);
+		FluidStack aOutput = FluidUtils.getFluidStack(FertileManureSlurry, 1000);
+
+		for (FluidStack aBloodStack : mBloodFluids) {
+			for (ItemStack aBoneStack : mList_Master_Bones) {
+				aBone = ItemUtils.getSimpleStack(aBoneStack, 2);
+				for (ItemStack aMeatStack : mList_Master_Meats) {
+					aMeat = ItemUtils.getSimpleStack(aMeatStack, 5);
+					// Poop Juice to Fertile Slurry
+					GT_Values.RA.addMixerRecipe(aCircuit, aBone, aMeat, aInputCells, aBloodStack, // Input Fluid
+							aOutput, // Output Fluid
+							aEmptyCells, // Output Item
+							20 * 8, // Time?
+							60 // Eu?
+							);
+				}
+			}
+		}
+	}
+
+	private static void addBasicOrganiseFertRecipes() {
+		FluidStack aInputFluid = FluidUtils.getFluidStack(ManureSlurry, 1000);
+		ItemStack aOutputDust = ItemUtils.getSimpleStack(dustOrganicFertilizer, 3);
+		ItemStack aPeat;
+		ItemStack aMeat;
+		for (ItemStack aPeatStack : mPeat) {
+			aPeat = ItemUtils.getSimpleStack(aPeatStack, 3);
+			for (ItemStack aMeatStack : mList_Master_Meats) {
+				aMeat = ItemUtils.getSimpleStack(aMeatStack, 5);
+				CORE.RA.addChemicalRecipe(aPeat, aMeat, aInputFluid, null, aOutputDust, 20 * 20, 120);
+			}
+
+			aPeat = ItemUtils.getSimpleStack(aPeatStack, 2);
+			for (ItemStack aMeatStack : mList_Master_FruitVege) {
+				aMeat = ItemUtils.getSimpleStack(aMeatStack, 9);
+				CORE.RA.addChemicalRecipe(aPeat, aMeat, aInputFluid, null, aOutputDust, 10 * 20, 120);
+			}
+		}
+	}
+
+	private static void addAdvancedOrganiseFertRecipes() {
+		FluidStack aInputFluid = FluidUtils.getFluidStack(FertileManureSlurry, 1000);
+		ItemStack aOutputDust = ItemUtils.getSimpleStack(dustOrganicFertilizer, 7);
+		ItemStack aPeat;
+		ItemStack aMeat;
+		for (ItemStack aPeatStack : mPeat) {
+			aPeat = ItemUtils.getSimpleStack(aPeatStack, 5);
+			for (ItemStack aMeatStack : mList_Master_Meats) {
+				aMeat = ItemUtils.getSimpleStack(aMeatStack, 7);
+				CORE.RA.addChemicalRecipe(aPeat, aMeat, aInputFluid, null, aOutputDust, 10 * 20, 140);
+			}
+			aPeat = ItemUtils.getSimpleStack(aPeatStack, 3);
+			for (ItemStack aMeatStack : mList_Master_FruitVege) {
+				aMeat = ItemUtils.getSimpleStack(aMeatStack, 12);
+				CORE.RA.addChemicalRecipe(aPeat, aMeat, aInputFluid, null, aOutputDust, 5 * 20, 140);
+			}
+		}
+	}
+
+	private static void addMiscRecipes() {
+
+		ItemStack aDustOrganicFert = ItemUtils.getSimpleStack(dustOrganicFertilizer, 1);
+		ItemStack aManureByprod = ItemUtils.getSimpleStack(dustManureByproducts, 1);
+
+		// Dehydrate Organise Fert to Normal Fert.
+
+		/**
+		 * Forestry Support
+		 */
+		if (LoadedMods.Forestry) {
+
+			Item aForestryFert = PluginCore.items.fertilizerCompound;
+
+			CORE.RA.addDehydratorRecipe(
+					new ItemStack[] { CI.getNumberedCircuit(11), ItemUtils.getSimpleStack(aDustOrganicFert, 4) }, null,
+					null, new ItemStack[] { ItemUtils.getSimpleStack(aForestryFert, 3), aManureByprod, aManureByprod },
+					new int[] { 10000, 2000, 2000 }, 20 * 20, 240);
+		}
+
+		/**
+		 * IC2 Support
+		 */
+		if (LoadedMods.IndustrialCraft2) {
+			CORE.RA.addDehydratorRecipe(
+					new ItemStack[] { CI.getNumberedCircuit(12), ItemUtils.getSimpleStack(aDustOrganicFert, 4) }, null,
+					null, new ItemStack[] { ItemUtils.getItemStackFromFQRN("IC2:itemFertilizer", 3), aManureByprod,
+							aManureByprod },
+					new int[] { 10000, 2000, 2000 }, 20 * 20, 240);
+		}
+
+		// Dirt Production
+		CORE.RA.addCompressorRecipe(ItemUtils.getSimpleStack(dustDirt, 9), ItemUtils.getSimpleStack(Blocks.dirt),
+				20 * 2, 8);
+
+		// Centrifuge Byproducts
+
+		// Ammonium Nitrate, Phosphates, Calcium, Copper, Carbon
+		GT_Values.RA.addCentrifugeRecipe(CI.getNumberedCircuit(20), ItemUtils.getSimpleStack(aManureByprod, 4),
+				FluidUtils.getFluidStack("sulfuricacid", 250), // In Fluid
+				FluidUtils.getFluidStack("sulfuricapatite", 50), // Out Fluid
+				Materials.Phosphorus.getDustSmall(2), Materials.Calcium.getDustSmall(2),
+				Materials.Copper.getDustTiny(1), Materials.Carbon.getDust(1), ItemUtils.getSimpleStack(dustDirt, 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAmmoniumNitrate", 1),
+				new int[] { 2500, 2500, 750, 1000, 5000, 250 }, // Chances
+				20 * 20, // Time
+				60); // EU
+
+		// Add Fuel Usages
+		CORE.RA.addSemifluidFuel(FluidUtils.getFluidStack(PoopJuice, 1000), 12);
+		CORE.RA.addSemifluidFuel(FluidUtils.getFluidStack(ManureSlurry, 1000), 24);
+		CORE.RA.addSemifluidFuel(FluidUtils.getFluidStack(FertileManureSlurry, 1000), 32);
+
+	}
+
+	@Override
+	public String errorMessage() {
+		// TODO Auto-generated method stub
+		return "Failed to generate recipes for AgroChem.";
+	}
+
+	@Override
+	public boolean generateRecipes() {
+		if (mBloodFluids.isEmpty()) {
+			Logger.INFO("Could not find, nor create Blood fluid. Unable to add recipes.");
+			return false;
+		}
+
+		// Organise OreDict
+		processAllOreDict();
+
+		// Slurry Production
+		addBasicSlurryRecipes();
+		addAdvancedSlurryRecipes();
+
+		// Organic Fert. Production
+		addBasicOrganiseFertRecipes();
+		addAdvancedOrganiseFertRecipes();
+
+		addMiscRecipes();
+		return true;
+	}
+}
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
index eea1aed49f..e060723afd 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
@@ -8,7 +8,7 @@ import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
-
+import gtPlusPlus.api.objects.minecraft.ItemPackage;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.item.base.BaseItemComponent;
 import gtPlusPlus.core.lib.CORE;
@@ -21,9 +21,10 @@ import gtPlusPlus.core.util.reflect.AddGregtechRecipe;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 
-public class CoalTar {
+public class CoalTar extends ItemPackage {
 
 	public static Fluid Coal_Gas;
+	public static Fluid Coal_Oil;
 	public static Fluid Ethylene;
 	public static Fluid Benzene;
 	public static Fluid Ethylbenzene;
@@ -39,116 +40,6 @@ public class CoalTar {
 	public static Fluid Hydrogen_Peroxide;
 	public static Fluid Lithium_Peroxide;
 
-	public static void run(){
-
-		//Special Compatibility for Coke
-		ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(ModItems.itemCoalCoke, 1), "fuelCoke");
-		//Create Coal Gas
-		Coal_Gas = FluidUtils.generateFluidNonMolten("CoalGas", "Coal Gas", 500, new short[]{48, 48, 48, 100}, null, null);
-		//Ethanol
-		// v - Dehydrate cells to remove water
-		
-		
-		//Create Ethylene
-		if (!FluidUtils.doesFluidExist("Ethylene")){
-			Ethylene = FluidUtils.generateFluidNonMolten("Ethylene", "Ethylene", -103, new short[]{255, 255, 255, 100}, null, null);
-		}
-		else {
-			Ethylene = FluidUtils.getWildcardFluidStack("Ethylene", 1).getFluid();
-		}
-		
-		//Create Benzene - (Toluene + Hydrogen | 95% Benzene / 5% methane)
-		if (!FluidUtils.doesFluidExist("NitrousOxide")){
-			Benzene = FluidUtils.generateFluidNonMolten("Benzene", "Benzene", 81, new short[]{150, 75, 0, 100}, null, null);
-		}
-		else {
-			Benzene = FluidUtils.getWildcardFluidStack("Benzene", 1).getFluid();
-		}
-		
-		//Create Ethylbenzene - Ethylbenzene is produced in on a large scale by combining benzene and ethylene in an acid-catalyzed chemical reaction
-		//Use Chemical Reactor
-		Ethylbenzene = FluidUtils.generateFluidNonMolten("Ethylbenzene", "Ethylbenzene", 136, new short[]{255, 255, 255, 100}, null, null);
-		//Create Anthracene
-		Anthracene = FluidUtils.generateFluidNonMolten("Anthracene", "Anthracene", 340, new short[]{255, 255, 255, 100}, null, null);
-		//Toluene
-		if (!FluidUtils.doesFluidExist("Toluene")){
-			Toluene = FluidUtils.generateFluidNonMolten("Toluene", "Toluene", -95, new short[]{140, 70, 20, 100}, null, null);
-		}
-		else {
-			Toluene = FluidUtils.getWildcardFluidStack("Toluene", 1).getFluid();
-			Item itemCellToluene = new BaseItemComponent("Toluene", "Toluene", new short[]{140, 70, 20, 100});
-			MaterialGenerator.addFluidCannerRecipe(ItemUtils.getEmptyCell(), ItemUtils.getSimpleStack(itemCellToluene), FluidUtils.getFluidStack(Toluene, 1000), null);
-		}
-
-		//Create Coal Tar
-		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)
-		//Create Coal Tar Oil
-		Coal_Tar_Oil = FluidUtils.generateFluidNonMolten("CoalTarOil", "Coal Tar Oil", 240, new short[]{240, 240, 150, 100}, null, null);
-		// v - Wash With Sulfuric Acid
-		//Create Sulfuric Coal Tar Oil
-		Sulfuric_Coal_Tar_Oil = FluidUtils.generateFluidNonMolten("SulfuricCoalTarOil", "Sulfuric Coal Tar Oil", 240, new short[]{250, 170, 12, 100}, null, null);
-		// v - Distill (No loss, just time consuming)
-		//Create Naphthalene
-		Naphthalene = FluidUtils.generateFluidNonMolten("Naphthalene", "Naphthalene", 115, new short[]{210, 185, 135, 100}, null, null);
-		// v - Oxidize with mercury and nitric acid
-		//Create Phthalic Acid
-		Phthalic_Acid = FluidUtils.generateFluidNonMolten("PhthalicAcid", "Phthalic Acid", 207, new short[]{210, 220, 210, 100}, null, null);
-		// v - Dehydrate at 180C+
-		//Create Phthalic Anhydride
-		ItemUtils.generateSpecialUseDusts("PhthalicAnhydride", "Phthalic Anhydride", "C6H4(CO)2O", Utils.rgbtoHexValue(175, 175, 175));
-
-
-
-		//Create 2-Ethylanthraquinone
-		//2-Ethylanthraquinone is prepared from the reaction of phthalic anhydride and ethylbenzene
-		Ethylanthraquinone2 = FluidUtils.generateFluidNonMolten("2Ethylanthraquinone", "2-Ethylanthraquinone", 415, new short[]{227, 255, 159, 100}, null, null);
-		//Create 2-Ethylanthrahydroquinone
-		//Palladium plate + Hydrogen(250) + 2-Ethylanthraquinone(500) = 600 Ethylanthrahydroquinone
-		Ethylanthrahydroquinone2 = FluidUtils.generateFluidNonMolten("2Ethylanthrahydroquinone", "2-Ethylanthrahydroquinone", 415, new short[]{207, 225, 129, 100}, null, null);
-		//Create Hydrogen Peroxide
-		//Compressed Air(1500) + Ethylanthrahydroquinone(500) + Anthracene(5) = 450 Ethylanthraquinone && 200 Peroxide
-		Hydrogen_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", "HLiO2", Utils.rgbtoHexValue(125, 125, 125));
-		// v - Dehydrate
-		//Lithium Peroxide - 2 LiOOH → Li2O2 + H2O2 + 2 H2O
-		Lithium_Peroxide = FluidUtils.generateFluidNonMolten("LithiumPeroxide", "Lithium Peroxide", 446, new short[]{135, 135, 135, 100}, null, null);
-
-		//Burn the coal gas!
-		GT_Values.RA.addFuel(ItemUtils.getItemStackOfAmountFromOreDict("cellCoalGas", 1), null, 96, 1);
-		GT_Values.RA.addFuel(ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricCoalTarOil", 1), null, 32, 3);
-		GT_Values.RA.addFuel(ItemUtils.getItemStackOfAmountFromOreDict("cellCoalTarOil", 1), null, 64, 3);
-		GT_Values.RA.addFuel(ItemUtils.getItemStackOfAmountFromOreDict("cellCoalTar", 1), null, 128, 3);
-		createRecipes();
-
-
-	}
-
-	private static void createRecipes() {
-		recipeCreateEthylene();
-		recipeCreateBenzene();
-		recipeCreateEthylbenzene();
-
-		recipeCoalToCoalTar();
-		recipeCoalTarToCoalTarOil();
-		recipeCoalTarOilToSulfuricOilToNaphthalene();
-		recipeNaphthaleneToPhthalicAcid();
-		recipePhthalicAcidToPhthalicAnhydride();
-		recipe2Ethylanthraquinone();
-		recipe2Ethylanthrahydroquinone();
-		recipeHydrogenPeroxide();
-		recipeLithiumHydroperoxide();
-		recipeLithiumPeroxide();
-		
-		recipeEthylBenzineFuelsIntoHeavyFuel();
-	}
-
-
-
 	private static void recipeEthylBenzineFuelsIntoHeavyFuel() {
 			CORE.RA.addChemicalRecipe(
 					ItemUtils.getItemStackOfAmountFromOreDict("cellFuel", 9), 
@@ -228,6 +119,15 @@ public class CoalTar {
 
 
 	public static void recipeCoalToCoalTar(){
+		//Charcoal
+		AddGregtechRecipe.addCokeAndPyrolyseRecipes(
+				GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 32L),
+				8,
+				GT_Values.NF,
+				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDirt", 2),
+				FluidUtils.getFluidStack("fluid.coaltar", 800), 
+				15,
+				120);
 		//Lignite
 		AddGregtechRecipe.addCokeAndPyrolyseRecipes(
 				GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Lignite, 16L),
@@ -235,7 +135,7 @@ public class CoalTar {
 				GT_Values.NF,
 				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDarkAsh", 2),
 				FluidUtils.getFluidStack("fluid.coaltar", 800), 
-				90,
+				45,
 				60);
 
 		//Coal
@@ -245,7 +145,7 @@ public class CoalTar {
 				GT_Values.NF,
 				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDarkAsh", 2),
 				FluidUtils.getFluidStack("fluid.coaltar", 2200), 
-				60,
+				30,
 				120);
 
 		//Coke
@@ -255,7 +155,7 @@ public class CoalTar {
 				GT_Values.NF,
 				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallAsh", 3),
 				FluidUtils.getFluidStack("fluid.coaltar", 3400), 
-				30,
+				15,
 				240);
 
 	}
@@ -295,14 +195,24 @@ public class CoalTar {
 				900, //aDuration
 				30,//aEUt
 				false //Hidden?
-				);
+				);		
+		GT_Values.RA.addDistilleryRecipe(
+				CI.getNumberedCircuit(5), //Circuit
+				FluidUtils.getFluidStack("fluid.coaltar", 1500), //aInput
+				FluidUtils.getFluidStack("fluid.kerosene", 400), //aOutput
+				300, //aDuration
+				64,//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.coaltaroil", 500), //aOutput
+						FluidUtils.getFluidStack("liquid_naphtha", 100), //aOutput
+						FluidUtils.getFluidStack("fluid.ethylbenzene", 150), //aOutput
 						FluidUtils.getFluidStack("fluid.anthracene", 50), //aOutput
+						FluidUtils.getFluidStack("fluid.kerosene", 200), //aOutput
 				},
 				null,
 				900,
@@ -430,4 +340,141 @@ public class CoalTar {
 				240);
 	}
 
+	@Override
+	public String errorMessage() {
+		// TODO Auto-generated method stub
+		return "Bad Coal Science!";
+	}
+
+	@Override
+	public boolean generateRecipes() {
+		recipeCreateEthylene();
+		recipeCreateBenzene();
+		recipeCreateEthylbenzene();
+
+		recipeCoalToCoalTar();
+		recipeCoalTarToCoalTarOil();
+		recipeCoalTarOilToSulfuricOilToNaphthalene();
+		recipeNaphthaleneToPhthalicAcid();
+		recipePhthalicAcidToPhthalicAnhydride();
+		recipe2Ethylanthraquinone();
+		recipe2Ethylanthrahydroquinone();
+		recipeHydrogenPeroxide();
+		recipeLithiumHydroperoxide();
+		recipeLithiumPeroxide();
+		
+		recipeEthylBenzineFuelsIntoHeavyFuel();		
+
+		//Burn the coal gas!
+		GT_Values.RA.addFuel(ItemUtils.getItemStackOfAmountFromOreDict("cellCoalGas", 1), null, 96, 1);
+		CORE.RA.addSemifluidFuel(ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricCoalTarOil", 1), 64);
+		CORE.RA.addSemifluidFuel(ItemUtils.getItemStackOfAmountFromOreDict("cellCoalTarOil", 1), 32);
+		CORE.RA.addSemifluidFuel(ItemUtils.getItemStackOfAmountFromOreDict("cellCoalTar", 1), 16);		
+		
+		return true;
+	}
+
+	@Override
+	public void items() {
+		//Phthalic_Acid = FluidUtils.generateFluidNonMolten("PhthalicAcid", "Phthalic Acid", 207, new short[]{210, 220, 210, 100}, null, null);
+		// v - Dehydrate at 180C+
+		//Create Phthalic Anhydride
+		ItemUtils.generateSpecialUseDusts("PhthalicAnhydride", "Phthalic Anhydride", "C6H4(CO)2O", Utils.rgbtoHexValue(175, 175, 175));
+
+		//Lithium Hydroperoxide - LiOH + H2O2 → LiOOH + 2 H2O
+		ItemUtils.generateSpecialUseDusts("LithiumHydroperoxide", "Lithium Hydroperoxide", "HLiO2", Utils.rgbtoHexValue(125, 125, 125));
+		// v - Dehydrate
+		//Lithium Peroxide - 2 LiOOH → Li2O2 + H2O2 + 2 H2O
+		//Lithium_Peroxide = FluidUtils.generateFluidNonMolten("LithiumPeroxide", "Lithium Peroxide", 446, new short[]{135, 135, 135, 100}, null, null);
+	}
+
+	@Override
+	public void blocks() {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void fluids() {
+
+
+		//Special Compatibility for Coke
+		ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(ModItems.itemCoalCoke, 1), "fuelCoke");
+		//Create Coal Gas
+		Coal_Gas = FluidUtils.generateFluidNonMolten("CoalGas", "Coal Gas", 500, new short[]{48, 48, 48, 100}, null, null);
+		//Ethanol
+		// v - Dehydrate cells to remove water
+		
+		
+		//Create Ethylene
+		if (!FluidUtils.doesFluidExist("Ethylene")){
+			Ethylene = FluidUtils.generateFluidNonMolten("Ethylene", "Ethylene", -103, new short[]{255, 255, 255, 100}, null, null);
+		}
+		else {
+			Ethylene = FluidUtils.getWildcardFluidStack("Ethylene", 1).getFluid();
+		}
+		
+		//Create Benzene - (Toluene + Hydrogen | 95% Benzene / 5% methane)
+		if (!FluidUtils.doesFluidExist("NitrousOxide")){
+			Benzene = FluidUtils.generateFluidNonMolten("Benzene", "Benzene", 81, new short[]{150, 75, 0, 100}, null, null);
+		}
+		else {
+			Benzene = FluidUtils.getWildcardFluidStack("Benzene", 1).getFluid();
+		}
+		
+		//Create Ethylbenzene - Ethylbenzene is produced in on a large scale by combining benzene and ethylene in an acid-catalyzed chemical reaction
+		//Use Chemical Reactor
+		Ethylbenzene = FluidUtils.generateFluidNonMolten("Ethylbenzene", "Ethylbenzene", 136, new short[]{255, 255, 255, 100}, null, null);
+		//Create Anthracene
+		Anthracene = FluidUtils.generateFluidNonMolten("Anthracene", "Anthracene", 340, new short[]{255, 255, 255, 100}, null, null);
+		//Toluene
+		if (!FluidUtils.doesFluidExist("Toluene")){
+			Toluene = FluidUtils.generateFluidNonMolten("Toluene", "Toluene", -95, new short[]{140, 70, 20, 100}, null, null);
+		}
+		else {
+			Toluene = FluidUtils.getWildcardFluidStack("Toluene", 1).getFluid();
+			Item itemCellToluene = new BaseItemComponent("Toluene", "Toluene", new short[]{140, 70, 20, 100});
+			MaterialGenerator.addFluidCannerRecipe(ItemUtils.getEmptyCell(), ItemUtils.getSimpleStack(itemCellToluene), FluidUtils.getFluidStack(Toluene, 1000), null);
+		}
+
+		//Create Coal Tar
+		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)
+		//Create Coal Tar Oil
+		Coal_Tar_Oil = FluidUtils.generateFluidNonMolten("CoalTarOil", "Coal Tar Oil", 240, new short[]{240, 240, 150, 100}, null, null);
+		// v - Wash With Sulfuric Acid
+		//Create Sulfuric Coal Tar Oil
+		Sulfuric_Coal_Tar_Oil = FluidUtils.generateFluidNonMolten("SulfuricCoalTarOil", "Sulfuric Coal Tar Oil", 240, new short[]{250, 170, 12, 100}, null, null);
+		// v - Distill (No loss, just time consuming)
+		//Create Naphthalene
+		Naphthalene = FluidUtils.generateFluidNonMolten("Naphthalene", "Naphthalene", 115, new short[]{210, 185, 135, 100}, null, null);
+		// v - Oxidize with mercury and nitric acid
+		//Create Phthalic Acid
+		Phthalic_Acid = FluidUtils.generateFluidNonMolten("PhthalicAcid", "Phthalic Acid", 207, new short[]{210, 220, 210, 100}, null, null);
+		// v - Dehydrate at 180C+
+		//Create Phthalic Anhydride
+		//ItemUtils.generateSpecialUseDusts("PhthalicAnhydride", "Phthalic Anhydride", "C6H4(CO)2O", Utils.rgbtoHexValue(175, 175, 175));
+
+
+
+		//Create 2-Ethylanthraquinone
+		//2-Ethylanthraquinone is prepared from the reaction of phthalic anhydride and ethylbenzene
+		Ethylanthraquinone2 = FluidUtils.generateFluidNonMolten("2Ethylanthraquinone", "2-Ethylanthraquinone", 415, new short[]{227, 255, 159, 100}, null, null);
+		//Create 2-Ethylanthrahydroquinone
+		//Palladium plate + Hydrogen(250) + 2-Ethylanthraquinone(500) = 600 Ethylanthrahydroquinone
+		Ethylanthrahydroquinone2 = FluidUtils.generateFluidNonMolten("2Ethylanthrahydroquinone", "2-Ethylanthrahydroquinone", 415, new short[]{207, 225, 129, 100}, null, null);
+		//Create Hydrogen Peroxide
+		//Compressed Air(1500) + Ethylanthrahydroquinone(500) + Anthracene(5) = 450 Ethylanthraquinone && 200 Peroxide
+		Hydrogen_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", "HLiO2", Utils.rgbtoHexValue(125, 125, 125));
+		// v - Dehydrate
+		//Lithium Peroxide - 2 LiOOH → Li2O2 + H2O2 + 2 H2O
+		Lithium_Peroxide = FluidUtils.generateFluidNonMolten("LithiumPeroxide", "Lithium Peroxide", 446, new short[]{135, 135, 135, 100}, null, null);
+
+	}
+
 }
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
new file mode 100644
index 0000000000..02afada849
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
@@ -0,0 +1,108 @@
+package gtPlusPlus.core.item.chemistry;
+
+import gregtech.api.enums.TextureSet;
+import gtPlusPlus.api.objects.minecraft.ItemPackage;
+import gtPlusPlus.core.material.Material;
+import gtPlusPlus.core.material.MaterialGenerator;
+import gtPlusPlus.core.material.state.MaterialState;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.item.Item;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
+
+public class GenericChem extends ItemPackage {
+
+	/**
+	 * Materials
+	 */	
+	
+	public static final Material BAKELITE = new Material("Bakelite", MaterialState.SOLID, TextureSet.SET_DULL, new short[]{90, 140, 140}, 120, 240, 23, 24, true, "", 0);//Not a GT Inherited Material
+	public static final Material NYLON = new Material("Nylon", MaterialState.SOLID, TextureSet.SET_SHINY, new short[]{45, 45, 45}, 300, 600, 44, 48, true, "", 0);//Not a GT Inherited Material
+	public static final Material TEFLON = new Material("Teflon", MaterialState.SOLID, TextureSet.SET_SHINY, new short[]{75, 45, 75}, 300, 600, 44, 48, true, "", 0);//Not a GT Inherited Material
+
+	//public static final Material HYPOGEN = new Material("Hypogen", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{220, 120, 75}, 12255, 19377, 240, 251, true, "Hy⚶", 0);//Not a GT Inherited Material
+	//public static final Material HYPOGEN = new Material("Hypogen", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{220, 120, 75}, 12255, 19377, 240, 251, true, "Hy⚶", 0);//Not a GT Inherited Material
+	//public static final Material Nylon = new Material();
+	
+	/**
+	 * Fluids
+	 */
+
+	public Fluid Benzene;
+	public Fluid NitroBenzene;
+	public Fluid Aniline;
+	public Fluid Polyurethane;
+	public Fluid Phenol; //https://en.wikipedia.org/wiki/Phenol#Uses
+	public Fluid Cyclohexane; //https://en.wikipedia.org/wiki/Cyclohexane	
+	public Fluid Cyclohexanone; //https://en.wikipedia.org/wiki/Cyclohexanone
+	
+	public Fluid Cadaverine; //https://en.wikipedia.org/wiki/Cadaverine
+	public Fluid Putrescine; //https://en.wikipedia.org/wiki/Putrescine
+	
+
+	/**
+	 * Items
+	 */
+
+	// Phenol Byproducts
+	public Item PhenolicResins; //https://en.wikipedia.org/wiki/Phenol_formaldehyde_resin
+
+
+
+	@Override
+	public void items() {		
+		PhenolicResins = ItemUtils.generateSpecialUseDusts("phenolicresins", "Phenolic Resin", "HOC6H4CH2OH", Utils.rgbtoHexValue(80, 40, 40))[0];		
+		MaterialGenerator.generate(BAKELITE, false);	
+		MaterialGenerator.generate(NYLON, false);
+		MaterialGenerator.generate(TEFLON, false);
+	}
+
+	@Override
+	public void blocks() {}
+
+	@Override
+	public void fluids() {
+		
+		if (!FluidRegistry.isFluidRegistered("benzene")) {
+			Benzene = FluidUtils.generateFluidNoPrefix("benzene", "Benzene", 278,	new short[] { 100, 70, 30, 100 }, true);			
+		}
+		else {
+			Benzene = FluidRegistry.getFluid("benzene");
+		}
+		
+		NitroBenzene = FluidUtils.generateFluidNoPrefix("nitrobenzene", "NitroBenzene", 278,	new short[] { 70, 50, 40, 100 }, true);
+		
+		Aniline = FluidUtils.generateFluidNoPrefix("aniline", "Aniline", 266,	new short[] { 100, 100, 30, 100 }, true);
+		
+		Polyurethane = FluidUtils.generateFluidNoPrefix("polyurethane", "Polyurethane", 350,	new short[] { 100, 70, 100, 100 }, true);
+		
+		if (!FluidRegistry.isFluidRegistered("phenol")) {
+			Phenol = FluidUtils.generateFluidNoPrefix("phenol", "Phenol", 313,	new short[] { 100, 70, 30, 100 }, true);			
+		}
+		else {
+			Phenol = FluidRegistry.getFluid("phenol");
+		}		
+		
+		Cyclohexane = FluidUtils.generateFluidNoPrefix("cyclohexane", "Cyclohexane", 32 + 175,	new short[] { 100, 70, 30, 100 }, true);		
+		Cyclohexanone = FluidUtils.generateFluidNoPrefix("cyclohexanone", "Cyclohexanone", 32 + 175,	new short[] { 100, 70, 30, 100 }, true);
+		
+		Cadaverine = FluidUtils.generateFluidNoPrefix("cadaverine", "Cadaverine", 32 + 175,	new short[] { 100, 70, 30, 100 }, true);
+		Putrescine = FluidUtils.generateFluidNoPrefix("putrescine", "Putrescine", 32 + 175,	new short[] { 100, 70, 30, 100 }, true);
+		
+	}	
+
+	@Override
+	public String errorMessage() {
+		// TODO Auto-generated method stub
+		return "Failed to generate recipes for AgroChem.";
+	}
+
+	@Override
+	public boolean generateRecipes() {		
+
+		
+		return true;
+	}
+}
diff --git a/src/Java/gtPlusPlus/core/i