Merged in AlkWork (pull request #4)

AlkWork

13 files changed, 1690 insertions, 595 deletions

diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 354107147b..fd2b98c7be 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -35,11 +35,13 @@ import gtPlusPlus.core.item.chemistry.AgriculturalChem;
 import gtPlusPlus.core.item.chemistry.CoalTar;
 import gtPlusPlus.core.item.chemistry.GenericChem;
 import gtPlusPlus.core.item.chemistry.IonParticles;
+import gtPlusPlus.core.item.chemistry.MilledOreProcessing;
 import gtPlusPlus.core.item.chemistry.NuclearChem;
 import gtPlusPlus.core.item.chemistry.RocketFuels;
 import gtPlusPlus.core.item.chemistry.StandardBaseParticles;
 import gtPlusPlus.core.item.crafting.ItemDummyResearch;
 import gtPlusPlus.core.item.effects.RarityUncommon;
+import gtPlusPlus.core.item.food.BaseItemMetaFood;
 import gtPlusPlus.core.item.general.BaseItemGrindle;
 import gtPlusPlus.core.item.general.BufferCore;
 import gtPlusPlus.core.item.general.ItemAirFilter;
@@ -94,6 +96,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.everglades.GTplusplus_Everglades;
+import gtPlusPlus.preloader.CORE_Preloader;
 import gtPlusPlus.xmod.cofh.HANDLER_COFH;
 import gtPlusPlus.xmod.eio.material.MaterialEIO;
 import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechItems;
@@ -367,6 +370,8 @@ public final class ModItems {
 
 	public static CoreItem itemExquisiteIndustrialDiamond;
 
+	public static BaseItemMetaFood itemMetaFood;
+
 	static {
 		Logger.INFO("Items!");
 		//Default item used when recipes fail, handy for debugging. Let's make sure they exist when this class is called upon.
@@ -384,7 +389,7 @@ public final class ModItems {
 		itemDummyResearch = new ItemDummyResearch();
 		
 		//Debug Loading
-		if (CORE.DEBUG){
+		if (CORE_Preloader.DEBUG_MODE){
 			DEBUG_INIT.registerItems();
 		}
 
@@ -996,6 +1001,8 @@ public final class ModItems {
 		//General Chemistry
 		new GenericChem();
 		
+		// Milled Ore Processing
+		new MilledOreProcessing();
 		
 		//Bombs
 		itemBombCasing = new CoreItem("itemBombCasing", "Bomb Casing", tabMisc);
diff --git a/src/Java/gtPlusPlus/core/item/base/ore/BaseItemMilledOre.java b/src/Java/gtPlusPlus/core/item/base/ore/BaseItemMilledOre.java
new file mode 100644
index 0000000000..4edf4ae75d
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/base/ore/BaseItemMilledOre.java
@@ -0,0 +1,25 @@
+package gtPlusPlus.core.item.base.ore;
+
+import gregtech.api.enums.Materials;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.material.Material;
+import gtPlusPlus.core.util.minecraft.MaterialUtils;
+import net.minecraft.item.Item;
+
+public class BaseItemMilledOre extends BaseOreComponent{
+
+	public BaseItemMilledOre(final Material material, int aMaterialEU) {
+		super(material, BaseOreComponent.ComponentTypes.MILLED);
+		CORE.RA.addMillingRecipe(material, aMaterialEU);
+	}	
+
+	public static Item generate(Materials aMat, int aMaterialEU) {
+		return generate(MaterialUtils.generateMaterialFromGtENUM(aMat), aMaterialEU);
+	}
+	
+	public static Item generate(Material aMat, int aMaterialEU) {
+		return new BaseItemMilledOre(aMat, aMaterialEU);
+	}
+	
+	
+}
diff --git a/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java b/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
index c5b7191ddd..356fdac24e 100644
--- a/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
+++ b/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
@@ -18,6 +18,7 @@ import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.EntityUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.xmod.gregtech.api.enums.CustomOrePrefix;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
@@ -48,7 +49,6 @@ public class BaseOreComponent extends Item{
 		this.setCreativeTab(AddToCreativeTab.tabMisc);
 		this.setUnlocalizedName(this.unlocalName);
 		this.setMaxStackSize(64);
-		//this.setTextureName(this.getCorrectTextures());
 		this.componentColour = material.getRgbAsHex();
 		GameRegistry.registerItem(this, this.unlocalName);
 		registerComponent();
@@ -59,9 +59,9 @@ public class BaseOreComponent extends Item{
 				//ThaumcraftUtils.addAspectToItem(ItemUtils.getSimpleStack(this), TC_Aspect_Wrapper.generate(TC_Aspects.RADIO.mAspect), componentMaterial.vRadiationLevel);				
 			}
 		}
-		
+
 	}
-	
+
 	public boolean registerComponent() {	
 		Logger.MATERIALS("Attempting to register "+this.getUnlocalizedName()+".");	
 		if (this.componentMaterial == null) {
@@ -92,7 +92,10 @@ public class BaseOreComponent extends Item{
 		else if (componentType == ComponentTypes.DUSTPURE) {
 			aKey = OrePrefixes.dustPure.name();
 		}
-		
+		else if (componentType == ComponentTypes.MILLED) {
+			aKey = CustomOrePrefix.milled.get().name();
+		}
+
 		ItemStack x = aMap.get(aKey);
 		if (x == null) {
 			aMap.put(aKey, ItemUtils.getSimpleStack(this));
@@ -107,13 +110,6 @@ public class BaseOreComponent extends Item{
 		}
 	}
 
-	public String getCorrectTextures(){
-		if (!CORE.ConfigSwitches.useGregtechTextures){
-			return CORE.MODID + ":" + "item"+this.componentType.COMPONENT_NAME;
-		}
-		return "gregtech" + ":" + "materialicons/METALLIC/" + this.componentType.COMPONENT_NAME;
-	}
-
 	/*@Override
 	public String getItemStackDisplayName(final ItemStack p_77653_1_) {
 			return (this.componentType.getPrefix()+this.componentMaterial.getLocalizedName()+this.componentType.DISPLAY_NAME);
@@ -181,7 +177,13 @@ public class BaseOreComponent extends Item{
 	@Override
 	@SideOnly(Side.CLIENT)
 	public void registerIcons(final IIconRegister par1IconRegister){
-		if (CORE.ConfigSwitches.useGregtechTextures){
+		if (this.componentType == ComponentTypes.MILLED) {
+			this.base = par1IconRegister.registerIcon(CORE.MODID + ":" + "processing/MilledOre/"+this.componentType.getComponent());
+			if (this.componentType.hasOverlay()){
+				this.overlay = par1IconRegister.registerIcon(CORE.MODID + ":" + "processing/MilledOre/"+this.componentType.getComponent()+"_Overlay");
+			}
+		}		
+		else if (CORE.ConfigSwitches.useGregtechTextures){
 			//Logger.MATERIALS(this.componentType.getPrefix()+this.componentMaterial.getLocalizedName()+this.componentType.DISPLAY_NAME+" is using `"+"gregtech" + ":" + "materialicons/METALLIC/" + this.componentType.COMPONENT_NAME+"' as the layer 0 texture path.");
 			this.base = par1IconRegister.registerIcon("gregtech" + ":" + "materialicons/METALLIC/" + this.componentType.COMPONENT_NAME);
 			if (this.componentType.hasOverlay()){
@@ -199,13 +201,21 @@ public class BaseOreComponent extends Item{
 
 	@Override
 	public int getColorFromItemStack(final ItemStack stack, final int renderPass) {
-		if (renderPass == 0 && !CORE.ConfigSwitches.useGregtechTextures){
+		if (this.componentType == ComponentTypes.MILLED) {			
+			if (renderPass == 1){
+				return Utils.rgbtoHexValue(230, 230, 230);
+			}
 			return this.componentColour;
 		}
-		if (renderPass == 1 && CORE.ConfigSwitches.useGregtechTextures){
-			return Utils.rgbtoHexValue(230, 230, 230);
-		}
-		return this.componentColour;
+		else {
+			if (renderPass == 0 && !CORE.ConfigSwitches.useGregtechTextures){
+				return this.componentColour;
+			}
+			if (renderPass == 1 && CORE.ConfigSwitches.useGregtechTextures){
+				return Utils.rgbtoHexValue(230, 230, 230);
+			}
+			return this.componentColour;
+		}		
 	}
 
 
@@ -226,7 +236,8 @@ public class BaseOreComponent extends Item{
 		DUSTPURE("dustPure", "Purified ", " Dust", true),
 		CRUSHED("crushed", "Crushed ", " Ore", true),
 		CRUSHEDCENTRIFUGED("crushedCentrifuged", "Centrifuged Crushed "," Ore", true),
-		CRUSHEDPURIFIED("crushedPurified", "Purified Crushed ", " Ore", true);
+		CRUSHEDPURIFIED("crushedPurified", "Purified Crushed ", " Ore", true),
+		MILLED("milled", "Milled ", " Ore", true);
 
 		private String COMPONENT_NAME;
 		private String PREFIX;
@@ -252,7 +263,7 @@ public class BaseOreComponent extends Item{
 		public boolean hasOverlay(){
 			return this.HAS_OVERLAY;
 		}
-		
+
 		public String getPrefix(){
 			return this.PREFIX;
 		}
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
index 0e23e9a845..3f02ca898d 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
@@ -12,6 +12,7 @@ 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.material.ELEMENT;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
@@ -556,6 +557,22 @@ public class AgriculturalChem extends ItemPackage {
 		CORE.RA.addSemifluidFuel(FluidUtils.getFluidStack(ManureSlurry, 1000), 24);
 		CORE.RA.addSemifluidFuel(FluidUtils.getFluidStack(FertileManureSlurry, 1000), 32);
 
+		// Red Slurry / Tailings Processing
+		GT_Values.RA.addCentrifugeRecipe(
+				CI.getNumberedBioCircuit(10),
+				GT_Values.NI,
+				FluidUtils.getFluidStack(AgriculturalChem.RedMud, 1000),
+				FluidUtils.getWater(500),
+				ELEMENT.getInstance().IRON.getSmallDust(1),
+				ELEMENT.getInstance().COPPER.getSmallDust(1),
+				ELEMENT.getInstance().TIN.getSmallDust(1),
+				ELEMENT.getInstance().SULFUR.getSmallDust(1),
+				ELEMENT.getInstance().NICKEL.getTinyDust(1),
+				ELEMENT.getInstance().LEAD.getTinyDust(1),
+				new int[] { 3000, 3000, 2000, 2000, 1000, 1000 }, 
+				30 * 20, 
+				30);
+
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
index 981bfed479..37428b18d6 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
@@ -189,20 +189,20 @@ public class CoalTar extends ItemPackage {
 		GT_Values.RA.addDistilleryRecipe(
 				CI.getNumberedCircuit(5), //Circuit
 				FluidUtils.getFluidStack("fluid.coaltar", 1500), //aInput
-				FluidUtils.getFluidStack("fluid.kerosene", 400), //aOutput
+				FluidUtils.getFluidStack("fluid.kerosene", 600), //aOutput
 				300, //aDuration
 				64,//aEUt
 				false //Hidden?
 				);	
 		
 		GT_Values.RA.addDistillationTowerRecipe(
-				FluidUtils.getFluidStack("fluid.coaltar", 1000),
+				FluidUtils.getFluidStack("fluid.coaltar", 1200),
 				new FluidStack[]{
 						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
+						FluidUtils.getFluidStack("fluid.kerosene", 400), //aOutput
 				},
 				null,
 				900,
@@ -314,9 +314,6 @@ public class CoalTar extends ItemPackage {
 	@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
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
index 49d3303688..ff55326031 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
@@ -1,12 +1,15 @@
 package gtPlusPlus.core.item.chemistry;
 
+import static gtPlusPlus.core.lib.CORE.GTNH;
+
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.TextureSet;
-import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.minecraft.ItemPackage;
 import gtPlusPlus.core.item.chemistry.general.ItemGenericChemBase;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.ELEMENT;
+import gtPlusPlus.core.material.MISC_MATERIALS;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialGenerator;
 import gtPlusPlus.core.material.MaterialStack;
@@ -16,8 +19,9 @@ import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.plugin.agrichem.item.algae.ItemAgrichemBase;
-import net.minecraft.block.Block;
+import gtPlusPlus.plugin.agrichem.BioRecipes;
+import gtPlusPlus.plugin.agrichem.block.AgrichemFluids;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -28,14 +32,21 @@ import net.minecraftforge.fluids.FluidStack;
 public class GenericChem extends ItemPackage {
 
 	/**
+	 * Switches
+	 */
+
+	private static boolean usingGregtechNitricOxide = false;
+	private static boolean usingGregtechNitrogenDioxide = false;
+
+	/**
 	 * Materials
 	 */	
-	
+
 	public static final Material BAKELITE = new Material("Bakelite", MaterialState.SOLID, TextureSet.SET_DULL, new short[]{90, 140, 140}, 120, 240, 23, 24, true, null, 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, null, 0);//Not a GT Inherited Material
 	public static final Material CARBYNE = new Material("Carbyne", MaterialState.SOLID, TextureSet.SET_DULL, new short[]{25, 25, 25}, 2500, 5000, 63, 52, true, null, 0);//Not a GT Inherited Material
-	
-	
+
+
 	//Refined PTFE
 	public static final Material TEFLON = new Material(
 			"Teflon",
@@ -52,34 +63,37 @@ public class GenericChem extends ItemPackage {
 					new MaterialStack(NONMATERIAL.PLASTIC, 15),
 					new MaterialStack(ELEMENT.getInstance().CARBON, 5),
 					new MaterialStack(ELEMENT.getInstance().SODIUM, 5)
-					});// Not a GT
-																										// Inherited
-																										// Material
+			});// 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
-	
+	public static Fluid Benzene;
+	public static Fluid NitroBenzene;
+	public static Fluid Aniline;
+	public static Fluid Polyurethane;
+	public static Fluid Phenol; //https://en.wikipedia.org/wiki/Phenol#Uses
+	public static Fluid Cyclohexane; //https://en.wikipedia.org/wiki/Cyclohexane	
+	public static Fluid Cyclohexanone; //https://en.wikipedia.org/wiki/Cyclohexanone	
+	public static Fluid Cadaverine; //https://en.wikipedia.org/wiki/Cadaverine
+	public static Fluid Putrescine; //https://en.wikipedia.org/wiki/Putrescine
+	public static Fluid BoricAcid;
+	public static Fluid HydrochloricAcid;
+
 
 	public static Fluid Ethylanthraquinone2;
 	public static Fluid Ethylanthrahydroquinone2;
 	public static Fluid Hydrogen_Peroxide;
 	public static Fluid Lithium_Peroxide;
+	public static Fluid Nitric_Oxide;
+	public static Fluid Nitrogen_Dioxide;
 
 	/**
 	 * Items
@@ -89,6 +103,19 @@ public class GenericChem extends ItemPackage {
 	public Item PhenolicResins; //https://en.wikipedia.org/wiki/Phenol_formaldehyde_resin
 	public static ItemGenericChemBase mGenericChemItem1;
 
+	private ItemStack mCatalystCarrier;
+
+	public static ItemStack mRedCatalyst;
+	public static ItemStack mYellowCatalyst;
+	public static ItemStack mBlueCatalyst;
+	public static ItemStack mOrangeCatalyst;
+	public static ItemStack mPurpleCatalyst;
+	public static ItemStack mBrownCatalyst;
+	public static ItemStack mPinkCatalyst;
+
+	public static ItemStack mMillingBallAlumina;
+	public static ItemStack mMillingBallSoapstone;
+
 
 
 	@Override
@@ -99,26 +126,20 @@ public class GenericChem extends ItemPackage {
 		MaterialGenerator.generate(TEFLON, false);		
 
 		mGenericChemItem1 = new ItemGenericChemBase();		
-		
+
 		registerItemStacks();
 		registerOreDict();
+
+		GregtechItemList.Milling_Ball_Alumina.set(mMillingBallAlumina);
+		GregtechItemList.Milling_Ball_Soapstone.set(mMillingBallSoapstone);
+
 	}
 
-	private ItemStack mCatalystCarrier;
-	
-	public static ItemStack mRedCatalyst;
-	public static ItemStack mYellowCatalyst;
-	public static ItemStack mBlueCatalyst;
-	public static ItemStack mOrangeCatalyst;
-	public static ItemStack mPurpleCatalyst;
-	public static ItemStack mBrownCatalyst;
-	public static ItemStack mPinkCatalyst;
-	
-	
+
 	public void registerItemStacks() {
 
 		mCatalystCarrier = ItemUtils.simpleMetaStack(AgriculturalChem.mAgrichemItem1, 13, 1);
-		
+
 		mRedCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 0, 1);
 		mYellowCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 1, 1);
 		mBlueCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 2, 1);
@@ -126,9 +147,11 @@ public class GenericChem extends ItemPackage {
 		mPurpleCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 4, 1);
 		mBrownCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 5, 1);
 		mPinkCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 6, 1);
-		
+		mMillingBallAlumina = ItemUtils.simpleMetaStack(mGenericChemItem1, 7, 1);
+		mMillingBallSoapstone = ItemUtils.simpleMetaStack(mGenericChemItem1, 8, 1);
+
 	}
-	
+
 	public void registerOreDict() {
 
 		ItemUtils.addItemToOreDictionary(mRedCatalyst, "catalystIronCopper");
@@ -138,7 +161,9 @@ public class GenericChem extends ItemPackage {
 		ItemUtils.addItemToOreDictionary(mPurpleCatalyst, "catalystIridiumRuthenium");
 		ItemUtils.addItemToOreDictionary(mBrownCatalyst, "catalystNickelAluminium");
 		ItemUtils.addItemToOreDictionary(mPinkCatalyst, "catalystPlatinumRhodium");
-		
+		ItemUtils.addItemToOreDictionary(mMillingBallAlumina, "millingballAlumina");
+		ItemUtils.addItemToOreDictionary(mMillingBallSoapstone, "millingballSoapstone");
+
 	}
 
 	@Override
@@ -146,33 +171,43 @@ public class GenericChem extends ItemPackage {
 
 	@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);
-		
+
+		BoricAcid = FluidUtils.generateFluidNoPrefix("boricacid", "Boric Acid", 278, new short[] { 90, 30, 120, 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");
-		}		
-		
+		}	
+
+		// Use GT's if it exists, else make our own.
+		if (FluidRegistry.isFluidRegistered("hydrochloricacid_gt5u")) {
+			HydrochloricAcid = FluidRegistry.getFluid("hydrochloricacid_gt5u");	
+		}
+		else {
+			HydrochloricAcid = FluidUtils.generateFluidNoPrefix("hydrochloricacid", "Hydrochloric Acid", 285,	new short[] { 183, 200, 196, 100 }, true);
+		}	
+
 		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);
-		
+
 		//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);
@@ -183,6 +218,21 @@ public class GenericChem extends ItemPackage {
 		//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);
 
+		if (FluidRegistry.isFluidRegistered("nitricoxide")) {
+			Nitric_Oxide = FluidRegistry.getFluid("nitricoxide");
+			usingGregtechNitricOxide = true;
+		}
+		else {
+			Nitric_Oxide = FluidUtils.generateFluidNoPrefix("nitricoxide", "Nitric Oxide", 200, new short[] {125, 200, 240, 100});
+		}
+		if (FluidRegistry.isFluidRegistered("nitrogendioxide")) {
+			Nitrogen_Dioxide = FluidRegistry.getFluid("nitrogendioxide");
+			usingGregtechNitrogenDioxide = true;
+		}
+		else {
+			Nitrogen_Dioxide = FluidUtils.generateFluidNoPrefix("nitrogendioxide", "Nitrogen Dioxide", 200, new short[] {100, 175, 255, 100});
+		}
+
 
 
 		//Lithium Hydroperoxide - LiOH + H2O2 → LiOOH + 2 H2O
@@ -191,8 +241,8 @@ public class GenericChem extends ItemPackage {
 		//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
@@ -202,7 +252,7 @@ public class GenericChem extends ItemPackage {
 
 	@Override
 	public boolean generateRecipes() {
-		
+
 		recipeCatalystRed();
 		recipeCatalystYellow();
 		recipeCatalystBlue();
@@ -210,24 +260,165 @@ public class GenericChem extends ItemPackage {
 		recipeCatalystPurple();
 		recipeCatalystBrown();
 		recipeCatalystPink();
-		
+
+		recipeGrindingBallAlumina();
+		recipeGrindingBallSoapstone();
+
 		recipeNitroBenzene();
 		recipeAniline();
 		recipeCadaverineAndPutrescine();
 		recipeCyclohexane();
 		recipeCyclohexanone();
-		
+
 		recipe2Ethylanthraquinone();
 		recipe2Ethylanthrahydroquinone();
 		recipeHydrogenPeroxide();
 		recipeLithiumHydroperoxide();
-		recipeLithiumPeroxide();		
-		
+		recipeLithiumPeroxide();
+		if (!usingGregtechNitricOxide) {
+			recipeNitricOxide();	
+		}
+		if (!usingGregtechNitrogenDioxide) {
+			recipeNitrogenDioxide();	
+		}
+
+		// Add recipes if we are not using GT's fluid.
+		if (!FluidRegistry.isFluidRegistered("hydrochloricacid_gt5u")) {
+			recipeHydrochloricAcid();			
+		}
+		registerFuels();
+
 		return true;
+	}	
+
+
+	private static void registerFuels() {
+
+		// Burnables
+
+		// Gas Fuels
+		GT_Values.RA.addFuel(ItemUtils.getItemStackOfAmountFromOreDict("cellNitroBenzene", 1), null, 1250, 1);
+
+	}
+
+	private void recipeGrindingBallAlumina() {
+		CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
+				CI.getNumberedCircuit(10),
+				ItemUtils.getSimpleStack(AgriculturalChem.mAlumina, 64)
+		}, 
+				FluidUtils.getFluidStack(GenericChem.Aniline, 4000), 
+				ItemUtils.getSimpleStack(mMillingBallAlumina, 8),
+				180 * 20, 
+				480);
+	}
+	private void recipeGrindingBallSoapstone() {
+		CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
+				CI.getNumberedCircuit(10),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustSoapstone", 32)
+		}, 
+				FluidUtils.getFluidStack(AgrichemFluids.mLiquidResin, 2500), 
+				ItemUtils.getSimpleStack(mMillingBallSoapstone, 8),
+				120 * 20, 
+				480);
+	}
+
+	private void recipeNitrogenDioxide() {
+		ItemStack aNitricOxideCell = ItemUtils.getItemStackOfAmountFromOreDict("cellNitricOxide", 1); 
+		ItemStack aNitrogenDioxideCell = ItemUtils.getItemStackOfAmountFromOreDict("cellNitrogenDioxide", 1);		
+		GT_Values.RA.addChemicalRecipe(                   ItemUtils.getSimpleStack(aNitricOxideCell, 2), GT_Utility.getIntegratedCircuit(1), ELEMENT.getInstance().OXYGEN.getFluid(1000),      FluidUtils.getFluidStack(Nitrogen_Dioxide, 3000), CI.emptyCells(2), 160);
+		GT_Values.RA.addChemicalRecipe(                   ELEMENT.getInstance().OXYGEN.getCell(1),      GT_Utility.getIntegratedCircuit(1), FluidUtils.getFluidStack(Nitric_Oxide, 2000), FluidUtils.getFluidStack(Nitrogen_Dioxide, 3000), CI.emptyCells(1), 160);
+		GT_Values.RA.addChemicalRecipeForBasicMachineOnly(ItemUtils.getSimpleStack(aNitricOxideCell, 2), CI.emptyCells(1),        ELEMENT.getInstance().OXYGEN.getFluid(1000),      GT_Values.NF,                           ItemUtils.getSimpleStack(aNitrogenDioxideCell, 3), GT_Values.NI, 160, 30);
+		GT_Values.RA.addChemicalRecipeForBasicMachineOnly(ELEMENT.getInstance().OXYGEN.getCell(1),      CI.emptyCells(2),        FluidUtils.getFluidStack(Nitric_Oxide, 2000), GT_Values.NF,                           ItemUtils.getSimpleStack(aNitrogenDioxideCell, 3), GT_Values.NI, 160, 30);
+		GT_Values.RA.addChemicalRecipeForBasicMachineOnly(ItemUtils.getSimpleStack(aNitricOxideCell, 2), ELEMENT.getInstance().OXYGEN.getCell(1),       GT_Values.NF,                       GT_Values.NF,                           ItemUtils.getSimpleStack(aNitrogenDioxideCell, 3), GT_Values.NI, 160, 30);
+	}
+
+
+	private void recipeNitricOxide() {
+		ItemStack aWaterCell = ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 1);
+		ItemStack aNitricOxideCell = ItemUtils.getItemStackOfAmountFromOreDict("cellNitricOxide", 1); 		
+		GT_Values.RA.addChemicalRecipeForBasicMachineOnly(MISC_MATERIALS.AMMONIA.getCell(8), CI.emptyCells(1),         ELEMENT.getInstance().OXYGEN.getFluid(5000),  FluidUtils.getFluidStack(Nitric_Oxide, 4000), ItemUtils.getSimpleStack(aWaterCell, 9),       GT_Values.NI, 160, 30);
+		GT_Values.RA.addChemicalRecipeForBasicMachineOnly(ELEMENT.getInstance().OXYGEN.getCell(5),  CI.emptyCells(4),         MISC_MATERIALS.AMMONIA.getFluid(8000), FluidUtils.getFluidStack(Nitric_Oxide, 4000), ItemUtils.getSimpleStack(aWaterCell, 9),       GT_Values.NI, 160, 30);
+		GT_Values.RA.addChemicalRecipe(                   MISC_MATERIALS.AMMONIA.getCell(8), GT_Utility.getIntegratedCircuit(11), ELEMENT.getInstance().OXYGEN.getFluid(5000),  FluidUtils.getWater(9000),     ItemUtils.getSimpleStack(aNitricOxideCell, 4), CI.emptyCells(4), 160);
+		GT_Values.RA.addChemicalRecipe(                   ELEMENT.getInstance().OXYGEN.getCell(5),  GT_Utility.getIntegratedCircuit(11), MISC_MATERIALS.AMMONIA.getFluid(8000), FluidUtils.getWater(9000),     ItemUtils.getSimpleStack(aNitricOxideCell, 4), CI.emptyCells(1), 160);
+		GT_Values.RA.addChemicalRecipe(                   MISC_MATERIALS.AMMONIA.getCell(8), GT_Utility.getIntegratedCircuit(2),  ELEMENT.getInstance().OXYGEN.getFluid(5000),  FluidUtils.getFluidStack(Nitric_Oxide, 4000), CI.emptyCells(8), 320);
+		GT_Values.RA.addChemicalRecipe(                   ELEMENT.getInstance().OXYGEN.getCell(5),  GT_Utility.getIntegratedCircuit(2),  MISC_MATERIALS.AMMONIA.getFluid(8000), FluidUtils.getFluidStack(Nitric_Oxide, 4000), CI.emptyCells(5), 320);
+		GT_Values.RA.addChemicalRecipe(                   MISC_MATERIALS.AMMONIA.getCell(8), GT_Utility.getIntegratedCircuit(12), ELEMENT.getInstance().OXYGEN.getFluid(5000),  GT_Values.NF,                       ItemUtils.getSimpleStack(aNitricOxideCell, 4), CI.emptyCells(4), 160);
+		GT_Values.RA.addChemicalRecipe(                   ELEMENT.getInstance().OXYGEN.getCell(5),  GT_Utility.getIntegratedCircuit(12), MISC_MATERIALS.AMMONIA.getFluid(8000), GT_Values.NF,                       ItemUtils.getSimpleStack(aNitricOxideCell, 4), CI.emptyCells(1), 160);
+		GT_Values.RA.addChemicalRecipeForBasicMachineOnly(MISC_MATERIALS.AMMONIA.getCell(8), ELEMENT.getInstance().OXYGEN.getCell(5),        GT_Values.NF,                   GT_Values.NF,                       ItemUtils.getSimpleStack(aNitricOxideCell, 4), ItemUtils.getSimpleStack(aWaterCell, 9), 160, 30);
+		GT_Values.RA.addMultiblockChemicalRecipe(new ItemStack[]{GT_Utility.getIntegratedCircuit(1)}, new FluidStack[]{MISC_MATERIALS.AMMONIA.getFluid(8000), ELEMENT.getInstance().OXYGEN.getFluid(5000)}, new FluidStack[]{FluidUtils.getFluidStack(Nitric_Oxide, 4000), FluidUtils.getWater(9000)}, null, 160, 30);
+	}
+
+
+	private void recipeHydrochloricAcid() {
+
+		ItemStack aAcidCell = ItemUtils.getItemStackOfAmountFromOreDict("cellHydrochloricAcid", 1);
+
+		CORE.RA.addChemicalRecipe(                   
+				ELEMENT.getInstance().CHLORINE.getCell(1), 
+				GT_Utility.getIntegratedCircuit(1),  
+				ELEMENT.getInstance().HYDROGEN.getFluid(1000), 
+				FluidUtils.getFluidStack(HydrochloricAcid, 2000), 
+				CI.emptyCells(1), 
+				60, 
+				8);
+
+		CORE.RA.addChemicalRecipe(                  
+				ELEMENT.getInstance().HYDROGEN.getCell(1),
+				GT_Utility.getIntegratedCircuit(1),  
+				ELEMENT.getInstance().CHLORINE.getFluid(1000), 
+				FluidUtils.getFluidStack(HydrochloricAcid, 2000), 
+				CI.emptyCells(1), 
+				60, 
+				8);
+
+		GT_Values.RA.addElectrolyzerRecipe(
+				CI.emptyCells(1), 
+				GT_Utility.getIntegratedCircuit(1),
+				FluidUtils.getFluidStack(HydrochloricAcid, 2000),
+				ELEMENT.getInstance().CHLORINE.getFluid(1000),
+				ELEMENT.getInstance().HYDROGEN.getCell(1), 
+				GT_Values.NI,            
+				GT_Values.NI, 
+				GT_Values.NI,
+				GT_Values.NI,
+				GT_Values.NI, 
+				null, 
+				720, 
+				30);
+
+		GT_Values.RA.addElectrolyzerRecipe(
+				CI.emptyCells(1),            
+				GT_Utility.getIntegratedCircuit(11), 
+				FluidUtils.getFluidStack(HydrochloricAcid, 2000),        
+				ELEMENT.getInstance().HYDROGEN.getFluid(1000), 
+				ELEMENT.getInstance().CHLORINE.getCell(1),      
+				GT_Values.NI,                  
+				GT_Values.NI, 
+				GT_Values.NI,
+				GT_Values.NI, 
+				GT_Values.NI, 
+				null, 
+				720, 
+				30);
+
+		GT_Values.RA.addElectrolyzerRecipe(
+				ItemUtils.getSimpleStack(aAcidCell, 2), 
+				GT_Values.NI,
+				GT_Values.NF,
+				GT_Values.NF, 
+				ELEMENT.getInstance().HYDROGEN.getCell(1),
+				ELEMENT.getInstance().CHLORINE.getCell(1),
+				GT_Values.NI, 
+				GT_Values.NI,
+				GT_Values.NI, 
+				GT_Values.NI, 
+				null, 
+				720, 
+				30);		
 	}
 
 	private void recipeCyclohexane() {
-		
+
 		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
 						getTierTwoChip(),		
@@ -238,7 +429,7 @@ public class GenericChem extends ItemPackage {
 						FluidUtils.getFluidStack("hydrogen", 10000)
 				}, 
 				new ItemStack[] {
-						
+
 				}, 
 				new FluidStack[] {
 						FluidUtils.getFluidStack(Cyclohexane, 1000),
@@ -246,11 +437,11 @@ public class GenericChem extends ItemPackage {
 				20 * 120, 
 				120, 
 				2);
-		
+
 	}
 
 	private void recipeCyclohexanone() {
-		
+
 		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
 						getTierTwoChip(),		
@@ -261,7 +452,7 @@ public class GenericChem extends ItemPackage {
 						FluidUtils.getFluidStack("air", 10000)
 				}, 
 				new ItemStack[] {
-						
+
 				}, 
 				new FluidStack[] {
 						FluidUtils.getFluidStack(Cyclohexanone, 2000),
@@ -269,7 +460,7 @@ public class GenericChem extends ItemPackage {
 				20 * 120, 
 				120, 
 				2);
-		
+
 		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
 						getTierTwoChip(),
@@ -279,7 +470,7 @@ public class GenericChem extends ItemPackage {
 						FluidUtils.getFluidStack("oxygen", 5000)
 				}, 
 				new ItemStack[] {
-						
+
 				}, 
 				new FluidStack[] {
 						FluidUtils.getFluidStack(Cyclohexanone, 2000),
@@ -287,10 +478,10 @@ public class GenericChem extends ItemPackage {
 				20 * 120, 
 				120, 
 				2);
-		
-		
-		
-		
+
+
+
+