+ Added a Pine Tree.

+ Oredict BoP Pinecone if it exists.
$ Fixed Algae Farm controller recipe.
$ Fixed bug where getOrePrefixStack(rod) would return null.
$ Fixed a bug where getItemStackFromFQRN didn't work correctly.

4 files changed, 213 insertions, 16 deletions

diff --git a/src/Java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java b/src/Java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java
index a9bd1568b6..c9cdc41424 100644
--- a/src/Java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java
+++ b/src/Java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java
@@ -126,9 +126,9 @@ public class CommandEnableDebugWhileRunning implements ICommand
 					String aOreDictData = "";
 					if (!aOreDictNames.isEmpty()) {
 						for (String tag : aOreDictNames) {
-							aOreDictData += (tag+",");
+							aOreDictData += (tag+", ");
 						}
-						if (aOreDictData.endsWith(",")) {
+						if (aOreDictData.endsWith(", ")) {
 							aOreDictData = aOreDictData.substring(0, aOreDictData.length()-2);
 						}
 					}
@@ -167,6 +167,18 @@ public class CommandEnableDebugWhileRunning implements ICommand
 				}	
 			}
 		}
+		else if (argString[0].toLowerCase().equals("item")) {
+			if (argString.length > 1 && argString[1] != null && argString[1].length() > 0) {			
+				final EntityPlayer P = CommandUtils.getPlayer(S);
+				ItemStack aTest = ItemUtils.getItemStackFromFQRN(argString[1], 1);
+				if (P != null && aTest != null) {
+					PlayerUtils.messagePlayer(P, "Found fluid stack: "+ItemUtils.getItemName(aTest));						
+				}		
+				else if (P != null && aTest == null) {
+					PlayerUtils.messagePlayer(P, "Could not find valid item.");						
+				}	
+			}
+		}
 		else {		
 			final EntityPlayer P = CommandUtils.getPlayer(S);	
 			PlayerUtils.messagePlayer(P, "Invalid command, use '?' as an argument for help.'");
@@ -217,9 +229,9 @@ public class CommandEnableDebugWhileRunning implements ICommand
 						int a = 0;
 						String data = "";
 						for (String tag : aItemDataTags) {
-							data += (tag+",");
+							data += (tag+", ");
 						}
-						if (data.endsWith(",")) {
+						if (data.endsWith(", ")) {
 							data = data.substring(0, data.length()-2);
 						}
 						return data;
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
index 3f02ca898d..e11b163753 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
@@ -110,6 +110,7 @@ public class AgriculturalChem extends ItemPackage {
 	 * 21 - Lithium Chloride
 	 * 22 - Pellet Mold
 	 * 23 - Clean Aluminium Mix
+	 * 24 - Pinecone
 	 */
 
 	public static ItemStack mAlgaeBiosmass;
@@ -136,6 +137,8 @@ public class AgriculturalChem extends ItemPackage {
 	public static ItemStack mLithiumChloride;
 	public static ItemStack mPelletMold;
 	public static ItemStack mCleanAluminiumMix;
+	public static ItemStack mPinecone;
+	public static ItemStack mCrushedPine;
 	
 
 	@Override
@@ -205,6 +208,8 @@ public class AgriculturalChem extends ItemPackage {
 		mLithiumChloride = ItemUtils.simpleMetaStack(mAgrichemItem1, 21, 1);
 		mPelletMold = ItemUtils.simpleMetaStack(mAgrichemItem1, 22, 1);
 		mCleanAluminiumMix = ItemUtils.simpleMetaStack(mAgrichemItem1, 23, 1);
+		mPinecone = ItemUtils.simpleMetaStack(mAgrichemItem1, 24, 1);
+		mCrushedPine = ItemUtils.simpleMetaStack(mAgrichemItem1, 25, 1);
 
 		ItemUtils.addItemToOreDictionary(mGreenAlgaeBiosmass, "biomassGreenAlgae");
 		ItemUtils.addItemToOreDictionary(mBrownAlgaeBiosmass, "biomassBrownAlgae");
@@ -231,6 +236,8 @@ public class AgriculturalChem extends ItemPackage {
 		ItemUtils.addItemToOreDictionary(mSodiumHydroxide, "dustSodiumHydroxide");	
 		ItemUtils.addItemToOreDictionary(mSodiumCarbonate, "dustSodiumCarbonate");
 		ItemUtils.addItemToOreDictionary(mLithiumChloride, "dustLithiumChloride");	
+		ItemUtils.addItemToOreDictionary(mPinecone, "pinecone");	
+		ItemUtils.addItemToOreDictionary(mCrushedPine, "crushedPineMaterial");	
 		
 		//Handle GT NaOH dusts
 		List<ItemStack> NaOHSmall = OreDictionary.getOres("dustSmallSodiumHydroxide_GT5U", false);
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java b/src/Java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java
index 426f48ecf9..86ffe49eed 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java
@@ -1,46 +1,61 @@
 package gtPlusPlus.core.item.chemistry;
 
+import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
+import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.minecraft.ItemPackage;
 import gtPlusPlus.core.item.base.ore.BaseItemMilledOre;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
+import gtPlusPlus.core.util.minecraft.NBTUtils;
+import gtPlusPlus.xmod.bop.HANDLER_BiomesOPlenty;
+import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
 import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
 
 public class MilledOreProcessing extends ItemPackage {
 
 	/**
 	 * Fluids
 	 */
-	
+
 	public static Fluid ZincFlotationFroth;
 	public static Fluid CopperFlotationFroth;
 	public static Fluid NickelFlotationFroth;
 	public static Fluid PlatinumFlotationFroth;
 	public static Fluid PentlanditeFlotationFroth;
-	
-	
+
+	public static Fluid PineOil;
+
+
 	/**
 	 * Items
 	 */
 
 	// Zinc, Iron, Indium, Germanium
 	public static Item milledSphalerite;
-	
+
 	// Copper, Iron, Cadmium, Indium
 	public static Item milledChalcopyrite;
-	
+
 	// Nickel, Cobalt, Rhodium, Ruthenium
 	public static Item milledNickel;
-	
+
 	// Platinum, Rhodium, Selenium, Tellurium 
 	public static Item milledPlatinum;
 
 	// Iron, Nickel, Promethium, Hafnium 
 	public static Item milledPentlandite;
-	
+
 
 	@Override
 	public void items() {
@@ -50,7 +65,7 @@ public class MilledOreProcessing extends ItemPackage {
 		milledNickel = BaseItemMilledOre.generate(Materials.Nickel, MaterialUtils.getVoltageForTier(4));
 		milledPlatinum = BaseItemMilledOre.generate(Materials.Platinum, MaterialUtils.getVoltageForTier(5));
 		milledPentlandite = BaseItemMilledOre.generate(Materials.Pentlandite, MaterialUtils.getVoltageForTier(5));
-		
+
 	}
 
 	@Override
@@ -60,7 +75,7 @@ public class MilledOreProcessing extends ItemPackage {
 
 	@Override
 	public void fluids() {
-		
+
 		short[] aZincFrothRGB = Materials.Sphalerite.mRGBa;
 		ZincFlotationFroth = FluidUtils.generateFluidNoPrefix("froth.zincflotation", "Zinc Froth", 32 + 175, new short[] { aZincFrothRGB[0], aZincFrothRGB[1], aZincFrothRGB[2], 100 }, true);
 		short[] aCopperFrothRGB = Materials.Chalcopyrite.mRGBa;
@@ -72,9 +87,11 @@ public class MilledOreProcessing extends ItemPackage {
 		short[] aPentlanditeFrothRGB = Materials.Pentlandite.mRGBa;
 		PentlanditeFlotationFroth = FluidUtils.generateFluidNoPrefix("froth.pentlanditeflotation", "Pentlandite Froth", 32 + 175, new short[] { aPentlanditeFrothRGB[0], aPentlanditeFrothRGB[1], aPentlanditeFrothRGB[2], 100 }, true);
 
+		PineOil = FluidUtils.generateFluidNoPrefix("pineoil", "Pine Oil", 32 + 175, new short[] { 250, 200, 60, 100 }, true);
+
 	}
-	
-	
+
+
 
 	public MilledOreProcessing() {
 		super();
@@ -98,6 +115,7 @@ public class MilledOreProcessing extends ItemPackage {
 				30 * 20, 
 				30);*/
 
+
 	}
 
 	@Override
@@ -108,6 +126,150 @@ public class MilledOreProcessing extends ItemPackage {
 	@Override
 	public boolean generateRecipes() {
 		addMiscRecipes();
+		addPineOilExtraction();
 		return true;
 	}
+
+	private void addPineOilExtraction() {
+		AutoMap<ItemStack> aLogs = new AutoMap<ItemStack>();
+		AutoMap<ItemStack> aLeaves = new AutoMap<ItemStack>();
+		AutoMap<ItemStack> aSaplings = new AutoMap<ItemStack>();
+		AutoMap<ItemStack> aPinecones = new AutoMap<ItemStack>();
+
+		ItemStack aCrushedPine = ItemUtils.getSimpleStack(AgriculturalChem.mCrushedPine, 1);
+
+		aLogs.add(ItemUtils.getSimpleStack(BOP_Block_Registrator.log_Pine));
+		aLeaves.add(ItemUtils.getSimpleStack(BOP_Block_Registrator.leaves_Pine));
+		aSaplings.add(ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Pine));
+		aPinecones.add(ItemUtils.getSimpleStack(AgriculturalChem.mPinecone, 1));
+
+		if (LoadedMods.BiomesOPlenty) {
+			aLogs.add(HANDLER_BiomesOPlenty.getStack(HANDLER_BiomesOPlenty.logs4, 0, 1));
+			aLeaves.add(HANDLER_BiomesOPlenty.getStack(HANDLER_BiomesOPlenty.colorizedLeaves2, 1, 1));
+			aSaplings.add(HANDLER_BiomesOPlenty.getStack(HANDLER_BiomesOPlenty.colorizedSaplings, 5, 1));
+			aPinecones.add(ItemUtils.simpleMetaStack(HANDLER_BiomesOPlenty.mPineCone, 13, 1));			
+		}		
+		if (LoadedMods.Forestry) {
+			ItemStack aForestryLog = ItemUtils.getItemStackFromFQRN("Forestry:logs", 1);
+			if (aForestryLog != null) {
+				aForestryLog.setItemDamage(20); // Set to Pine
+				aLogs.add(aForestryLog);
+			}
+			ItemStack aForestryLeaves = ItemUtils.getItemStackFromFQRN("Forestry:leaves", 1);
+			if (aForestryLeaves != null) {
+				NBTUtils.setString(aForestryLeaves, "species", "forestry.treePine"); // Set to Pine
+				aLeaves.add(aForestryLeaves);
+			}
+		}
+		
+		for (ItemStack aLog : aLogs) {
+			addRecipe(aLog, ItemUtils.getSimpleStack(aCrushedPine, 16), new int[] {10000, 7500, 5000, 2500}, 10, 120);
+		}
+		for (ItemStack aLeaf : aLeaves) {
+			addRecipe(aLeaf, ItemUtils.getSimpleStack(aCrushedPine, 2), new int[] {5000, 5000, 2500, 2500}, 10, 30);
+		}
+		for (ItemStack aSapling : aSaplings) {
+			addRecipe(aSapling, ItemUtils.getSimpleStack(aCrushedPine, 4), new int[] {7500, 7500, 2500, 2500}, 10, 60);
+		}
+		for (ItemStack aCone : aPinecones) {
+			addRecipe(aCone, ItemUtils.getSimpleStack(aCrushedPine, 1), new int[] {7500, 7500, 5000, 2500}, 10, 60);
+		}
+		
+
+		CORE.RA.addChemicalPlantRecipe(
+				new ItemStack[] {
+						CI.getNumberedBioCircuit(16),
+						ItemUtils.getSimpleStack(aCrushedPine, 64)
+				}, 
+				new FluidStack[] {
+						FluidUtils.getSteam(5000),
+				}, 
+				new ItemStack[] {
+						ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAsh", 5),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAsh", 5),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustTinyDarkAsh", 5),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustTinyDarkAsh", 5)
+				}, 
+				new FluidStack[] {
+						FluidUtils.getFluidStack(PineOil, 1000)						
+				}, 
+				new int[] {
+					2000, 2000, 2000, 2000	
+				},
+				20 *60,
+				120, 
+				2);
+		
+		CORE.RA.addChemicalPlantRecipe(
+				new ItemStack[] {
+						CI.getNumberedBioCircuit(18),
+						ItemUtils.getSimpleStack(aCrushedPine, 64)
+				}, 
+				new FluidStack[] {
+						FluidUtils.getSuperHeatedSteam(5000),
+				}, 
+				new ItemStack[] {
+						ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAsh", 5),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAsh", 5),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustTinyDarkAsh", 5),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustTinyDarkAsh", 5)
+				}, 
+				new FluidStack[] {
+						FluidUtils.getFluidStack(PineOil, 2000)						
+				}, 
+				new int[] {
+					3000, 3000, 3000, 3000	
+				},
+				20 *60,
+				120, 
+				3);
+
+	}
+
+	public boolean addRecipe(ItemStack aInput, ItemStack aOutput1, int[] aChances, int aTime, int aEU) {
+		aOutput1 = GT_OreDictUnificator.get(true, aOutput1);
+		ItemStack aOutputs[] = new ItemStack[4];
+		for (int i=0;i<aChances.length;i++) {
+			aOutputs[i] = aOutput1;
+		}
+		aOutputs = cleanArray(aOutputs);
+		if ((GT_Utility.isStackInvalid(aInput)) || (GT_Utility.isStackInvalid(aOutput1) || (GT_Utility.getContainerItem(aInput, false) != null))) {
+			return false;
+		}
+		
+		return CORE.RA.addChemicalPlantRecipe(
+				new ItemStack[] {
+						CI.getNumberedBioCircuit(14),
+						aInput
+				}, 
+				new FluidStack[] {
+						
+				}, 
+				aOutputs, 
+				new FluidStack[] {
+						
+				}, 
+				aChances,
+				aTime * 20,
+				aEU, 
+				1);
+	}
+
+	public static ItemStack[] cleanArray(ItemStack[] input) {
+		int aArraySize = input.length;
+		AutoMap<ItemStack> aCleanedItems = new AutoMap<ItemStack>();		
+		for (ItemStack checkStack : input) {
+			if (ItemUtils.checkForInvalidItems(checkStack)) {
+				aCleanedItems.put(checkStack);
+			}
+		}		
+		ItemStack[] aOutput = new ItemStack[aCleanedItems.size()];
+		for (int i=0;i<aArraySize;i++) {
+			ItemStack aMappedStack = aCleanedItems.get(i);
+			if (aMappedStack != null){
+				aOutput[i] = aMappedStack;
+			}
+		}		
+		return aOutput;
+	}
 }
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index 725799a43d..3e536ec8d0 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -292,7 +292,20 @@ public class ItemUtils {
 	public static ItemStack getItemStackFromFQRN(final String fqrn, final int Size) // fqrn = fully qualified resource name
 	{
 		final String[] fqrnSplit = fqrn.split(":");
-		return GameRegistry.findItemStack(fqrnSplit[0], fqrnSplit[1], Size);
+		if (fqrnSplit.length < 2) {
+			return null;
+		}
+		else if (fqrnSplit.length == 2) {
+			return GameRegistry.findItemStack(fqrnSplit[0], fqrnSplit[1], Size);
+		}
+		else {
+			if (fqrnSplit.length == 3) {
+				ItemStack aStack = GameRegistry.findItemStack(fqrnSplit[0], fqrnSplit[1], Size);
+				int aMeta = Integer.getInteger(fqrnSplit[2]);
+				return ItemUtils.simpleMetaStack(aStack, aMeta, Size);
+			}
+		}
+		return null;
 	}
 
 	public static void generateSpawnEgg(final String entityModID, final String parSpawnName, final int colourEgg,
@@ -871,6 +884,9 @@ public class ItemUtils {
 	}
 
 	public static ItemStack getOrePrefixStack(OrePrefixes mPrefix, Materials mMat, int mAmount) {
+		if (mPrefix == OrePrefixes.rod) {
+			mPrefix = OrePrefixes.stick;
+		}
 		ItemStack aGtStack = GT_OreDictUnificator.get(mPrefix, mMat, mAmount);
 		if (aGtStack == null) {
 			Logger.INFO(