From 2c4a94b808c61d66163d9969017c2819ddb2c5ae Mon Sep 17 00:00:00 2001
From: Alkalus <Draknyte1@hotmail.com>
Date: Tue, 31 Mar 2020 16:35:15 +0100
Subject: + 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.

---
 src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'src/Java/gtPlusPlus/core/util')

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(
-- 
cgit