From 1fae9b63763f5f1ae63f3ed94337454c4aae63a8 Mon Sep 17 00:00:00 2001
From: Draknyte1 <Draknyte1@hotmail.com>
Date: Mon, 3 Jul 2017 23:13:59 +1000
Subject: $ Fixed 89.

---
 src/Java/gtPlusPlus/core/material/Material.java    |  2 +-
 .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java   |  4 ++--
 src/Java/gtPlusPlus/core/util/item/ItemUtils.java  | 26 ++++++++++++++++++++++
 3 files changed, 29 insertions(+), 3 deletions(-)

(limited to 'src/Java')

diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index eda13545c0..d20d1634f9 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -320,7 +320,7 @@ public class Material {
 	}
 
 	public final ItemStack getDust(final int stacksize){
-		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dust"+this.unlocalizedName, stacksize);
+		return ItemUtils.getGregtechDust("dust"+this.unlocalizedName, stacksize);
 	}
 
 	public final ItemStack getSmallDust(final int stacksize){
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index d95e12728b..b7ef4c0ea0 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -506,7 +506,7 @@ public class RECIPES_GREGTECH {
 		GT_Values.RA.addChemicalBathRecipe(
 				ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 10),
 				FluidUtils.getFluidStack("hydrofluoricacid", 20000),
-				ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumfluoride", 5),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 5),
 				null,
 				null,
 				new int[]{},
@@ -556,7 +556,7 @@ public class RECIPES_GREGTECH {
 				null, //Input Stack 2
 				FluidUtils.getFluidStack("hydrofluoricacid", 2500), //Fluid Input
 				FluidUtils.getFluidStack("water", 2500), //Fluid Output
-				ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumfluoride", 5), //Output Stack
+				ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 5), //Output Stack
 				600*20
 				);
 
diff --git a/src/Java/gtPlusPlus/core/util/item/ItemUtils.java b/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
index 16fac94c63..c46a25dae9 100644
--- a/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
@@ -556,4 +556,30 @@ public class ItemUtils {
 		return outputs;
 	}
 
+	private static String getModId(Item item) {
+		GameRegistry.UniqueIdentifier id = GameRegistry.findUniqueIdentifierFor(item);
+		return id == null || id.modId.equals("") ? "minecraft" : id.modId;
+	}
+
+	public static String getModId(ItemStack key) {
+		return getModId(key.getItem());
+	}
+	
+	//Take 2 - GT Dusts
+	public static ItemStack getGregtechDust(final String oredictName, final int amount){
+		final ArrayList<ItemStack> oreDictList = OreDictionary.getOres(oredictName);
+		if (!oreDictList.isEmpty()){
+			ItemStack returnvalue;
+			for (int xrc=0;xrc<oreDictList.size();xrc++){
+				String modid = getModId(oreDictList.get(xrc).getItem());
+				if (modid == "gregtech" || modid == CORE.MODID){
+					returnvalue = oreDictList.get(xrc).copy();
+					returnvalue.stackSize = amount;
+					return returnvalue;
+				}
+			}			
+		}
+		return getItemStackOfAmountFromOreDictNoBroken(oredictName, amount);
+	}
+
 }
-- 
cgit