% Tried fixing Sulfur Dioxide.

3 files changed, 47 insertions, 8 deletions

diff --git a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
index 1539488501..b820e674aa 100644
--- a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
+++ b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
@@ -227,6 +227,10 @@ public class FluidUtils {
 	public static Fluid addGTFluidNonMolten(final String aName, final String aLocalized, final short[] aRGBa, final int aState, final long aTemperatureK, final ItemStack aFullContainer, final ItemStack aEmptyContainer, final int aFluidAmount) {
 		return addGTFluid("fluid."+aName, "fluid.autogenerated", aLocalized, aRGBa, aState, aTemperatureK, aFullContainer, aEmptyContainer, aFluidAmount);
 	}
+	
+	public static Fluid addGTFluidNoPrefix(final String aName, final String aLocalized, final short[] aRGBa, final int aState, final long aTemperatureK, final ItemStack aFullContainer, final ItemStack aEmptyContainer, final int aFluidAmount) {
+		return addGTFluid(aName, "fluid.autogenerated", aLocalized, aRGBa, aState, aTemperatureK, aFullContainer, aEmptyContainer, aFluidAmount);
+	}
 
 	public static Fluid addGTPlasma(final Material aMaterial) {
 		if (aMaterial.getLocalizedName().toLowerCase().contains("clay") || aMaterial.getComposites().size()>1 || aMaterial.getLocalizedName().toLowerCase().contains("wrought")){
@@ -478,5 +482,32 @@ public class FluidUtils {
 		Utils.LOG_INFO("FLUID GENERATION FAILED FOR "+localizedName);
 		return null;
 	}
+	
+	public final static Fluid generateFluidNoPrefix(final String unlocalizedName, final String localizedName, final int MeltingPoint, final short[] RGBA){
+		if ((FluidUtils.getFluidStack(unlocalizedName.toLowerCase(), 1) == null)/* && ((dustStack != null) || (dustStack2 != null))*/){
+			Utils.LOG_WARNING("Generating our own fluid.");
+
+			//Generate a Cell if we need to
+			if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+unlocalizedName, 1) == null){
+				@SuppressWarnings("unused")
+				final
+				Item temp = new BaseItemComponent(unlocalizedName, localizedName, RGBA);
+			}
+
+			final Fluid gtFluid = FluidUtils.addGTFluidNoPrefix(
+					unlocalizedName,
+					localizedName,
+					RGBA,
+					4,
+					MeltingPoint,
+					ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+unlocalizedName, 1),
+					ItemList.Cell_Empty.get(1L, new Object[0]),
+					1000);
+
+			return gtFluid;
+		}
+		Utils.LOG_INFO("FLUID GENERATION FAILED FOR "+localizedName);
+		return null;	}
+	
 
 }
diff --git a/src/Java/gtPlusPlus/core/util/item/ItemUtils.java b/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
index b98a54cb6d..21d969066c 100644
--- a/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
@@ -252,6 +252,7 @@ public class ItemUtils {
 			Utils.LOG_INFO("Looking up: "+oredictName+" - from method: "+ReflectionUtils.getMethodName(4));
 			Utils.LOG_INFO("Looking up: "+oredictName+" - from method: "+ReflectionUtils.getMethodName(5));
 		}
+		try{
 
 		//Adds a check to grab dusts using GT methodology if possible.
 		ItemStack returnValue = null;
@@ -266,12 +267,18 @@ public class ItemUtils {
 
 		if (returnValue == null){
 			returnValue = getItemStackOfAmountFromOreDict(oredictName, amount);
-			if ((returnValue.getItem().getClass() != ModItems.AAA_Broken.getClass()) || (returnValue.getItem() != ModItems.AAA_Broken)){
-				return returnValue.copy();
+			if (returnValue != null){
+				if ((returnValue.getItem().getClass() != ModItems.AAA_Broken.getClass()) || (returnValue.getItem() != ModItems.AAA_Broken)){
+					return returnValue.copy();
+				}
 			}
 		}
 		Utils.LOG_INFO(oredictName+" was not valid.");
 		return null;
+		}
+		catch (Throwable t){
+			return null;
+		}
 	}
 
 	public static ItemStack getGregtechDust(final Materials material, final int amount){
@@ -321,9 +328,9 @@ public class ItemUtils {
 					new BaseItemDustUnique("itemDust"+unlocalizedName, materialName, Colour, "Dust")
 			};
 		}
-		
+
 		RecipeGen_DustGeneration.generateRecipes(material);
-		
+
 		return output;
 	}
 
@@ -568,7 +575,7 @@ public class ItemUtils {
 	public static String getModId(ItemStack key) {
 		return getModId(key.getItem());
 	}
-	
+
 	//Take 2 - GT/GT++ Dusts
 	public static ItemStack getGregtechDust(final String oredictName, final int amount){
 		final ArrayList<ItemStack> oreDictList = OreDictionary.getOres(oredictName);
@@ -585,7 +592,7 @@ public class ItemUtils {
 		}
 		return getNonTinkersDust(oredictName, amount);
 	}
-	
+
 	//Anything But Tinkers Dust
 	public static ItemStack getNonTinkersDust(final String oredictName, final int amount){
 		final ArrayList<ItemStack> oreDictList = OreDictionary.getOres(oredictName);
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
index 21746695ad..41ba4e2147 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
@@ -48,8 +48,9 @@ public class GregtechFluidHandler {
 			FluidUtils.addFluid("hydrofluoricAcid", "Industrial Strength Hydrofluoric Acid", GT_Materials.HydrofluoricAcid, 1, 120, GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.HydrofluoricAcid, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000);
 			generateIC2FluidCell("HydrofluoricAcid");
 
-			FluidUtils.addFluid("sulfurDioxide", "Sulfur Dioxide", GT_Materials.SulfurDioxide, 4, -100, GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfurDioxide, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000);
-			generateIC2FluidCell("SulfurDioxide");
+			//FluidUtils.generateFluid("sulfurDioxide", "Sulfur Dioxide", GT_Materials.SulfurDioxide, 4, -100, GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfurDioxide, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000);
+			//generateIC2FluidCell("SulfurDioxide");
+			FluidUtils.generateFluidNoPrefix("SulfurDioxide", "High quality Sulfur Dioxide", 263, GT_Materials.SulfurDioxide.mRGBa);
 
 			FluidUtils.addFluid("sulfurousAcid", "Sulfurous Acid", GT_Materials.SulfurousAcid, 4, 75, GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfurousAcid, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000);
 			generateIC2FluidCell("SulfurousAcid");