+ Added Multiblock Rocket Engine. Closes #464.

+ Added Liquid Hydrogen.
+ Added Carbon Dioxide if it doesn't exit (.08 compat)

4 files changed, 127 insertions, 58 deletions

diff --git a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
index f2b5d0683c..7ade6d0371 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
@@ -40,6 +40,7 @@ public class RocketFuels extends ItemPackage {
 	public static Fluid Nitrous_Oxide;		
 	public static Fluid Hydrated_Ammonium_Nitrate_Slurry;	
 	public static Fluid Liquid_Oxygen;
+	public static Fluid Liquid_Hydrogen;
 	public static Fluid Formaldehyde;
 
 
@@ -728,6 +729,21 @@ public class RocketFuels extends ItemPackage {
 			}
 		}
 		
+		//Create Liquid_Hydrogen
+				if (FluidUtils.getFluidStack("LiquidHydrogen", 1) == null && FluidUtils.getFluidStack("liquidhydrogen", 1) == null){
+					Liquid_Hydrogen = FluidUtils.generateFluidNonMolten("LiquidHydrogen", "Liquid Hydrogen", -240, new short[]{75, 75, 220, 100}, null, null);
+				}
+				else {
+					if (FluidUtils.getFluidStack("LiquidHydrogen", 1) != null ) {
+						Liquid_Hydrogen = FluidUtils.getFluidStack("LiquidHydrogen", 1).getFluid();				
+					}
+					else {
+						Liquid_Hydrogen = FluidUtils.getFluidStack("liquidhydrogen", 1).getFluid();
+					}
+					if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellLiquidHydrogen", 1) == null){				
+						new BaseItemComponent("LiquidHydrogen", "Liquid Hydrogen", new short[] {10, 10, 175});
+					}
+				}
 
 		Formaldehyde = FluidUtils.generateFluidNonMolten("Formaldehyde", "Formaldehyde", -92, new short[]{150, 75, 150, 100}, null, null);
 		
diff --git a/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java b/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
index 936e711ac2..bf6e0ef9e7 100644
--- a/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
+++ b/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
@@ -6,17 +6,17 @@ import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
 
 public final class MISC_MATERIALS {	
-	
+
 	/*
 	 * Some of these materials purely exist as data objects, items will most likely be assigned seperately.
 	 * Most are just compositions which will have dusts assigned to them.
 	 */
-	
+
 	public static void run() {
 		MaterialUtils.generateSpecialDustAndAssignToAMaterial(STRONTIUM_OXIDE, false);
 		MaterialUtils.generateSpecialDustAndAssignToAMaterial(STRONTIUM_HYDROXIDE, false);
 	}
-	
+
 	public static final Material STRONTIUM_OXIDE = new Material(
 			"Strontium Oxide", 
 			MaterialState.SOLID, 
@@ -33,8 +33,8 @@ public final class MISC_MATERIALS {
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().STRONTIUM, 1),
 					new MaterialStack(ELEMENT.getInstance().OXYGEN, 1)
-					});
-	
+			});
+
 	public static final Material STRONTIUM_HYDROXIDE = new Material(
 			"Strontium Hydroxide", 
 			MaterialState.SOLID, 
@@ -51,55 +51,70 @@ public final class MISC_MATERIALS {
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().STRONTIUM, 1),
 					new MaterialStack(FLUORIDES.HYDROXIDE, 2)
-					});
-	
-	   public static final Material SELENIUM_DIOXIDE = new Material(
-	            "Selenium Dioxide",
-	            MaterialState.PURE_LIQUID, //State
-	            null, //Material Colour
-	            -1, //Melting Point in C
-	            -1, //Boiling Point in C
-	            -1, //Protons
-	            -1,
-	            false, //Uses Blast furnace?
-	            //Material Stacks with Percentage of required elements.
-	            new MaterialStack[]{
-	                    new MaterialStack(ELEMENT.getInstance().SELENIUM, 1),
-	                    new MaterialStack(ELEMENT.getInstance().OXYGEN, 2)
-	            });
-	   
-       public static final Material SELENIOUS_ACID = new Material(
-               "Selenious Acid",
-               MaterialState.PURE_LIQUID, //State
-               null, //Material Colour
-               -1, //Melting Point in C
-               -1, //Boiling Point in C
-               -1, //Protons
-               -1,
-               false, //Uses Blast furnace?
-               //Material Stacks with Percentage of required elements.
-               new MaterialStack[]{
-                       new MaterialStack(SELENIUM_DIOXIDE, 1),
-                       new MaterialStack(ELEMENT.getInstance().HYDROGEN, 8),
-                       new MaterialStack(ELEMENT.getInstance().OXYGEN, 4)
-               });
-       
-       public static final Material HYDROGEN_CYANIDE = new Material(
-	            "Hydrogen Cyanide",
-	            MaterialState.PURE_LIQUID, //State
-	            null, //Material Colour
-	            4, //Melting Point in C
-	            26, //Boiling Point in C
-	            -1, //Protons
-	            -1,
-	            false, //Uses Blast furnace?
-	            //Material Stacks with Percentage of required elements.
-	            new MaterialStack[]{
-	                    new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1),
-	                    new MaterialStack(ELEMENT.getInstance().CARBON, 1),
-	                    new MaterialStack(ELEMENT.getInstance().NITROGEN, 1)
-	            });
+			});
+
+	public static final Material SELENIUM_DIOXIDE = new Material(
+			"Selenium Dioxide",
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-1, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1,
+			false, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().SELENIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 2)
+			});
+
+	public static final Material SELENIOUS_ACID = new Material(
+			"Selenious Acid",
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-1, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1,
+			false, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(SELENIUM_DIOXIDE, 1),
+					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 8),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 4)
+			});
+
+	public static final Material HYDROGEN_CYANIDE = new Material(
+			"Hydrogen Cyanide",
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			4, //Melting Point in C
+			26, //Boiling Point in C
+			-1, //Protons
+			-1,
+			false, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1),
+					new MaterialStack(ELEMENT.getInstance().CARBON, 1),
+					new MaterialStack(ELEMENT.getInstance().NITROGEN, 1)
+			});
+
+	public static final Material CARBON_DIOXIDE = new Material(
+			"Carbon Dioxide",
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-56, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1,
+			false, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().CARBON, 1),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 2)
+			});
+
+
 
-	
-	
 }
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index 6b6be32107..6e5cd0f8f0 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -463,9 +463,10 @@ public class Material {
 			}
 
 			if (generateFluid){
-				final Materials isValid = Materials.get(this.getLocalizedName());
-				if (FluidUtils.getFluidStack(localizedName, 1) != null){
-					this.vMoltenFluid = FluidUtils.getFluidStack(localizedName, 1).getFluid();
+				final Materials isValid = Materials.get(this.getLocalizedName());				
+				FluidStack aTest = FluidUtils.getWildcardFluidStack(localizedName, 1);				
+				if (aTest != null){
+					this.vMoltenFluid = aTest.getFluid();
 				}
 				else if (isValid == null || isValid == Materials._NULL){
 					queueFluidGeneration();
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
index aeeb4ae5be..e736592aed 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
@@ -5,12 +5,20 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
 import gregtech.GT_Mod;
+import gregtech.api.enums.OrePrefixes;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords;
 import gregtech.common.GT_Proxy;
+import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.material.MISC_MATERIALS;
+import gtPlusPlus.core.material.MaterialGenerator;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import net.minecraft.item.ItemStack;
 import net.minecraft.world.chunk.Chunk;
+import net.minecraftforge.fluids.FluidStack;
 
 public class PollutionUtils {
 
@@ -22,6 +30,8 @@ public class PollutionUtils {
 	private static Method mGetPollution;
 	private static Method mGetPollution2;
 
+	public static AutoMap<FluidStack> mPollutionFluidStacks = new AutoMap<FluidStack>();
+
 	static {
 		if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK || CORE.GTNH) {
 			mIsPollutionEnabled = mPollution();
@@ -164,5 +174,32 @@ public class PollutionUtils {
 			}
 		return 0;
 	}
+	
+	public static boolean setPollutionFluids() {
+		FluidStack CD, CM, SD;
+		CD = FluidUtils.getFluidStack("carbondioxide", 1000);
+		CM = FluidUtils.getFluidStack("carbonmonoxide", 1000);
+		SD = FluidUtils.getFluidStack("sulfuredioxide", 1000);
+		if (PollutionUtils.mPollutionFluidStacks.size() == 0) {
+			if (CD != null) {
+				PollutionUtils.mPollutionFluidStacks.put(CD);
+				ItemStack cellCD = ItemUtils.getItemStackOfAmountFromOreDict("cellCarbonDioxide", 1);
+				if (ItemUtils.checkForInvalidItems(cellCD)) {
+					MISC_MATERIALS.CARBON_DIOXIDE.registerComponentForMaterial(OrePrefixes.cell, cellCD);
+				}
+			}
+			else {
+				MaterialGenerator.generate(MISC_MATERIALS.CARBON_DIOXIDE, false, false);
+			}
+			if (CM != null)
+				PollutionUtils.mPollutionFluidStacks.put(CM);
+			if (SD != null)
+				PollutionUtils.mPollutionFluidStacks.put(SD);
+		}
+		if (PollutionUtils.mPollutionFluidStacks.size() > 0) {
+			return true;
+		}
+		return false;
+	}
 
 }