+ Added burn times for Wooden Pellets & Bricks.

% Many minor Bio recipe adjustments.
$ Fixed Oredict name of some Fluid Cells, advise if this breaks existing recipes. (Probably look at Alkalus ingots)

8 files changed, 195 insertions, 49 deletions

diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
index dc2c0232a6..c8b6253753 100644
--- a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
@@ -96,7 +96,7 @@ public class BaseItemComponent extends Item{
 		this.extraData = RGBA;
 		this.setTextureName(CORE.MODID + ":" + "item"+ComponentTypes.CELL.COMPONENT_NAME);
 		GameRegistry.registerItem(this, aFormattedNameForFluids);
-		GT_OreDictUnificator.registerOre(ComponentTypes.CELL.getOreDictName()+aFormattedNameForFluids, ItemUtils.getSimpleStack(this));
+		GT_OreDictUnificator.registerOre(ComponentTypes.CELL.getOreDictName()+Utils.sanitizeStringKeepBrackets(localName), ItemUtils.getSimpleStack(this));
 		registerComponent();
 	}
 
@@ -165,6 +165,14 @@ public class BaseItemComponent extends Item{
 	public final void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
 
 		try {
+			
+
+			if (this.componentMaterial == null){
+				if (this.materialName != null){
+					list.add(Utils.sanitizeStringKeepBrackets(materialName));					
+				}				
+			}			
+			
 			if ((this.materialName != null) && (this.materialName != "") && !this.materialName.equals("") && (this.componentMaterial != null)){
 
 
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index a8cef939be..88fdda555c 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -1220,7 +1220,7 @@ public class ItemUtils {
 	}
 
 	public static boolean doesOreDictHaveEntryFor(String string) {		
-		return OreDictionary.doesOreNameExist(string);
+		return OreDictUtils.containsValidEntries(string);
 	}
 
 	public static void hideItemFromNEI(ItemStack aItemToHide) {
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/OreDictUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/OreDictUtils.java
new file mode 100644
index 0000000000..324d39b863
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/util/minecraft/OreDictUtils.java
@@ -0,0 +1,25 @@
+package gtPlusPlus.core.util.minecraft;
+
+import java.util.List;
+
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.oredict.OreDictionary;
+
+public class OreDictUtils {
+
+	public static boolean containsValidEntries(String aOreName) {
+		boolean a = OreDictionary.doesOreNameExist(aOreName);
+		List<ItemStack> b = OreDictionary.getOres(aOreName, false);
+		
+		if (!a) {
+			return false;
+		}
+		else {
+			if (b == null || b.isEmpty()) {
+				return false;
+			}
+		}
+		return true;		
+	}
+	
+}
diff --git a/src/Java/gtPlusPlus/core/util/reflect/OreDictUtils.java b/src/Java/gtPlusPlus/core/util/reflect/OreDictUtils.java
deleted file mode 100644
index 6d34733545..0000000000
--- a/src/Java/gtPlusPlus/core/util/reflect/OreDictUtils.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package gtPlusPlus.core.util.reflect;
-
-public class OreDictUtils {
-
-	
-
-}
diff --git a/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java b/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java
index a80ae58b65..9512651417 100644
--- a/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java
+++ b/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java
@@ -20,6 +20,7 @@ import gtPlusPlus.core.material.MISC_MATERIALS;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.OreDictUtils;
 import gtPlusPlus.core.util.minecraft.RecipeUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.plugin.agrichem.block.AgrichemFluids;
@@ -168,12 +169,16 @@ public class BioRecipes {
 		recipeCompost();
 		recipeMethane();
 		recipeBenzene();
-		recipeStyrene();
-		
+		recipeStyrene();		
 		registerFuels();
 	}
 
 	private static void registerFuels() {
+		
+		// Burnables
+		ItemUtils.registerFuel(ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 1), 800);
+		ItemUtils.registerFuel(ItemUtils.getSimpleStack(AgriculturalChem.mWoodBrick, 1), 4800);
+		
 		// Gas Fuels
 		//GT_Values.RA.addFuel(ItemUtils.getItemStackOfAmountFromOreDict("cellCoalGas", 1), null, 96, 1);
 		
@@ -307,6 +312,26 @@ public class BioRecipes {
 		GT_ModHandler.addPulverisationRecipe(
 				ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 5),
 				ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 1));
+		
+		// Plastic		
+		CORE.RA.addFluidReactorRecipe(
+				new ItemStack[] {
+						getBioChip(16),
+						ItemUtils.getSimpleStack(AgriculturalChem.mCellulosePulp, 64),
+				},
+				new FluidStack[] {
+						FluidUtils.getFluidStack(BioRecipes.mAceticAcid, 500),
+						FluidUtils.getFluidStack(BioRecipes.mPropionicAcid, 500),
+				},
+				new ItemStack[] {
+						
+				},
+				new FluidStack[] {
+						FluidUtils.getFluidStack(BioRecipes.mLiquidPlastic, (144)),						
+				},
+				120 * 20,
+				240,
+				2);
 
 
 	}
@@ -524,16 +549,36 @@ public class BioRecipes {
 				new FluidStack[] {
 						FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 75),						
 				},
-				60 * 20,
+				90 * 20,
+				30,
+				1);
+		
+		CORE.RA.addFluidReactorRecipe(
+				new ItemStack[] {
+						getBioChip(5),
+						ItemUtils.getSimpleStack(Items.reeds, 32),
+						ItemUtils.getSimpleStack(ModItems.dustCalciumCarbonate, 4)
+				},
+				new FluidStack[] {
+						FluidUtils.getFluidStack(BioRecipes.mThermalWater, 2000),
+				},
+				new ItemStack[] {
+						
+				},
+				new FluidStack[] {
+						FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 150),						
+				},
+				120 * 20,
 				30,
 				1);
 		
 		// Sugar Beet
-		if (OreDictionary.doesOreNameExist("cropSugarbeet")) {
+		if (OreDictUtils.containsValidEntries("cropSugarbeet")) {
+			
 			CORE.RA.addFluidReactorRecipe(
 					new ItemStack[] {
 							getBioChip(4),
-							ItemUtils.getItemStackOfAmountFromOreDict("cropSugarbeet", 8)
+							ItemUtils.getItemStackOfAmountFromOreDict("cropSugarbeet", 8),
 					},
 					new FluidStack[] {
 							FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 1000),
@@ -547,6 +592,25 @@ public class BioRecipes {
 					60 * 20,
 					30,
 					1);
+			
+			CORE.RA.addFluidReactorRecipe(
+					new ItemStack[] {
+							getBioChip(5),
+							ItemUtils.getItemStackOfAmountFromOreDict("cropSugarbeet", 16),
+							ItemUtils.getSimpleStack(ModItems.dustCalciumCarbonate, 4)
+					},
+					new FluidStack[] {
+							FluidUtils.getFluidStack(BioRecipes.mThermalWater, 2000),
+					},
+					new ItemStack[] {
+							
+					},
+					new FluidStack[] {
+							FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 150),						
+					},
+					90 * 20,
+					30,
+					1);
 		}
 		
 		// Produce Acetone, Butanol and Ethanol
@@ -657,7 +721,7 @@ public class BioRecipes {
 						ItemUtils.getSimpleStack(AgriculturalChem.mSodiumHydroxide, 5)
 				},
 				new FluidStack[] {
-						
+						FluidUtils.getFluidStack(BioRecipes.mHydrogen, 5000),						
 				},
 				60 * 20,
 				60,
@@ -666,31 +730,50 @@ public class BioRecipes {
 
 	private static void recipeSodiumCarbonate() {
 
-		if (OreDictionary.doesOreNameExist("fuelCoke")) {
-			
-			GT_Values.RA.addBlastRecipe(
-					ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 4),
-					ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 4),
-					GT_Values.NF,
-					GT_Values.NF,
-					ItemUtils.getItemStackOfAmountFromOreDict("dustAluminium", 24),
-					null,
-					20 * 120,
+		if (OreDictUtils.containsValidEntries("fuelCoke")) {			
+			CORE.RA.addFluidReactorRecipe(
+					new ItemStack[] {
+							getBioChip(18),
+							ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 3),
+							ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 3),
+							ItemUtils.getSimpleStack(AgriculturalChem.mAluminiumPellet, 6)
+					},
+					new FluidStack[] {
+							FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 1000),
+					},
+					new ItemStack[] {
+							ItemUtils.getSimpleStack(AgriculturalChem.mSodiumAluminate, 18)
+					},
+					new FluidStack[] {
+							FluidUtils.getFluidStack(BioRecipes.mHydrogen, 200),
+							FluidUtils.getFluidStack(BioRecipes.mCarbonDioxide, 1600),
+					},
+					120 * 20,
 					120,
-					1600);
+					900);
 			
 		}	
 
-		GT_Values.RA.addBlastRecipe(
-				ItemUtils.getSimpleStack(AgriculturalChem.mAlumina, 24),
-				ItemUtils.getItemStackOfAmountFromOreDict("dustCoal", 4),
-				GT_Values.NF,
-				GT_Values.NF,
-				ItemUtils.getItemStackOfAmountFromOreDict("dustAluminium", 24),
-				null,
-				20 * 120,
+		CORE.RA.addFluidReactorRecipe(
+				new ItemStack[] {
+						getBioChip(18),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustCoal", 6),
+						ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 4),
+						ItemUtils.getSimpleStack(AgriculturalChem.mAluminiumPellet, 6)
+				},
+				new FluidStack[] {
+						FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 1000),
+				},
+				new ItemStack[] {
+						ItemUtils.getSimpleStack(AgriculturalChem.mSodiumAluminate, 16)
+				},
+				new FluidStack[] {
+						FluidUtils.getFluidStack(BioRecipes.mHydrogen, 100),
+						FluidUtils.getFluidStack(BioRecipes.mCarbonDioxide, 1750),
+				},
+				180 * 20,
 				120,
-				1600);
+				900);
 		
 	}
 
@@ -736,6 +819,39 @@ public class BioRecipes {
 
 	private static void recipeLithiumChloride() {
 
+		if (OreDictUtils.containsValidEntries("dustRockSalt")) {
+			GT_Values.RA.addElectrolyzerRecipe(
+					ItemUtils.getItemStackOfAmountFromOreDict("dustRockSalt", 8), 
+					ItemUtils.getSimpleStack(AgriculturalChem.mLithiumChloride, 10),
+					FluidUtils.getFluidStack(BioRecipes.mAir, 4000),
+					FluidUtils.getFluidStack(BioRecipes.mChlorine, 500),					
+					ItemUtils.getItemStackOfAmountFromOreDict("dustLithium", 2), 
+					ItemUtils.getItemStackOfAmountFromOreDict("dustSmallLithium", 3), 
+					ItemUtils.getItemStackOfAmountFromOreDict("dustSmallLithium", 3), 
+					ItemUtils.getItemStackOfAmountFromOreDict("dustTinyLithium", 5), 
+					ItemUtils.getItemStackOfAmountFromOreDict("dustPotassium", 2), 
+					ItemUtils.getItemStackOfAmountFromOreDict("dustSmallPotassium", 5),					
+					new int[] {7500, 8000, 8500, 9000, 7500, 8500}, 					
+					60 * 30, 
+					60);
+		}
+		if (OreDictUtils.containsValidEntries("dustPotash")) {
+			GT_Values.RA.addElectrolyzerRecipe(
+					ItemUtils.getItemStackOfAmountFromOreDict("dustPotash", 10), 
+					ItemUtils.getSimpleStack(AgriculturalChem.mLithiumChloride, 16),
+					FluidUtils.getFluidStack(BioRecipes.mThermalWater, 2000),
+					FluidUtils.getFluidStack(BioRecipes.mChlorine, 250),					
+					ItemUtils.getItemStackOfAmountFromOreDict("dustLithium", 3), 
+					ItemUtils.getItemStackOfAmountFromOreDict("dustSmallLithium", 5), 
+					ItemUtils.getItemStackOfAmountFromOreDict("dustSmallLithium", 5), 
+					ItemUtils.getItemStackOfAmountFromOreDict("dustTinyLithium", 7), 
+					ItemUtils.getItemStackOfAmountFromOreDict("dustAsh", 2), 
+					ItemUtils.getItemStackOfAmountFromOreDict("dustAsh", 2),					
+					new int[] {7500, 8000, 8500, 9000, 9000, 9000}, 					
+					45 * 30, 
+					90);
+		}
+		
 	}
 
 	private static void recipeAlginicAcid() {
@@ -768,7 +884,7 @@ public class BioRecipes {
 						
 				},
 				new FluidStack[] {
-						FluidUtils.getFluidStack(BioRecipes.mSulfuricAcid, 5),						
+						FluidUtils.getFluidStack(BioRecipes.mSulfuricAcid, 50),						
 				},
 				60 * 20,
 				60,
@@ -787,10 +903,10 @@ public class BioRecipes {
 						
 				},
 				new FluidStack[] {
-						FluidUtils.getFluidStack(BioRecipes.mSulfuricAcid, 15),						
+						FluidUtils.getFluidStack(BioRecipes.mSulfuricAcid, 250),						
 				},
 				60 * 20,
-				60,
+				120,
 				2);
 		
 	}
@@ -906,7 +1022,8 @@ public class BioRecipes {
 			CORE.RA.addFluidReactorRecipe(
 					new ItemStack[] {
 							getBioChip(11),
-							ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 16)
+							ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 16),
+							ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 8)
 					},
 					new FluidStack[] {
 							FluidUtils.getFluidStack(BioRecipes.mUrea, 500),
@@ -926,7 +1043,8 @@ public class BioRecipes {
 		CORE.RA.addFluidReactorRecipe(
 				new ItemStack[] {
 						getBioChip(12),
-						ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 16)
+						ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 16),
+						ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 8)
 				},
 				new FluidStack[] {
 						FluidUtils.getFluidStack(BioRecipes.mUrea, 500),
diff --git a/src/Java/gtPlusPlus/plugin/agrichem/block/AgrichemFluids.java b/src/Java/gtPlusPlus/plugin/agrichem/block/AgrichemFluids.java
index 099645131a..039dd702da 100644
--- a/src/Java/gtPlusPlus/plugin/agrichem/block/AgrichemFluids.java
+++ b/src/Java/gtPlusPlus/plugin/agrichem/block/AgrichemFluids.java
@@ -57,7 +57,7 @@ public class AgrichemFluids {
 			mFermentationBase = FluidRegistry.getFluid("fermentation.base");
 		}
 		if (!FluidRegistry.isFluidRegistered("ureamix")) {
-			mUrea = FluidUtils.generateFluidNoPrefix("ureamix", "Urea Mix", 200,	new short[] { 71, 55, 12, 100 }, true);			
+			mUrea = FluidUtils.generateFluidNoPrefix("ureamix", "Urea Mix", 200, new short[] { 71, 55, 12, 100 }, true);			
 		}
 		else {
 			mUrea = FluidRegistry.getFluid("ureamix");
diff --git a/src/Java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java b/src/Java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java
index 14d15fdfa1..671c765270 100644
--- a/src/Java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java
+++ b/src/Java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java
@@ -5,6 +5,7 @@ import java.util.List;
 import cpw.mods.fml.common.registry.GameRegistry;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.OreDictUtils;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
@@ -103,8 +104,8 @@ public class ItemAgrichemBase extends Item {
 			return mShowSodiumHydroxide;
 		}
 		else {
-			if (OreDictionary.doesOreNameExist("dustSodiumHydroxide_GT5U")
-					|| OreDictionary.doesOreNameExist("dustSodiumHydroxide")) {
+			if (OreDictUtils.containsValidEntries("dustSodiumHydroxide_GT5U")
+					|| OreDictUtils.containsValidEntries("dustSodiumHydroxide")) {
 				List<ItemStack> aTest = OreDictionary.getOres(
 						"dustSodiumHydroxide", false
 				);
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java
index 736d0bc389..c499de0fa5 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java
@@ -23,6 +23,7 @@ import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.MiningUtils;
+import gtPlusPlus.core.util.minecraft.OreDictUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
 import net.minecraft.block.Block;
@@ -509,23 +510,23 @@ public abstract class GregtechMetaTileEntity_BedrockMiningPlatformBase extends G
 		mMixedOreData.put(new Pair<String, Integer>("oreLapis", 40));
 		mMixedOreData.put(new Pair<String, Integer>("oreRedstone", 40));
 		
-		if (LoadedMods.Thaumcraft || (OreDictionary.doesOreNameExist("oreAmber") && OreDictionary.doesOreNameExist("oreCinnabar"))) {
+		if (LoadedMods.Thaumcraft || (OreDictUtils.containsValidEntries("oreAmber") && OreDictUtils.containsValidEntries("oreCinnabar"))) {
 			mMixedOreData.put(new Pair<String, Integer>("oreAmber", 20));
 			mMixedOreData.put(new Pair<String, Integer>("oreCinnabar", 20));
 		}
-		if (LoadedMods.Railcraft || OreDictionary.doesOreNameExist("oreSaltpeter")) {	
+		if (LoadedMods.Railcraft || OreDictUtils.containsValidEntries("oreSaltpeter")) {	
 			mMixedOreData.put(new Pair<String, Integer>("oreSaltpeter", 10));
 		}
-		if (LoadedMods.IndustrialCraft2 || OreDictionary.doesOreNameExist("oreUranium")) {
+		if (LoadedMods.IndustrialCraft2 || OreDictUtils.containsValidEntries("oreUranium")) {
 			mMixedOreData.put(new Pair<String, Integer>("oreUranium", 10));	
 		}
-		if (OreDictionary.doesOreNameExist("oreSulfur")) {
+		if (OreDictUtils.containsValidEntries("oreSulfur")) {
 			mMixedOreData.put(new Pair<String, Integer>("oreSulfur", 15));			
 		}
-		if (OreDictionary.doesOreNameExist("oreSilicon")) {
+		if (OreDictUtils.containsValidEntries("oreSilicon")) {
 			mMixedOreData.put(new Pair<String, Integer>("oreSilicon", 15));			
 		}
-		if (OreDictionary.doesOreNameExist("oreApatite")) {
+		if (OreDictUtils.containsValidEntries("oreApatite")) {
 			mMixedOreData.put(new Pair<String, Integer>("oreApatite", 25));			
 		}