diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core')
-rw-r--r-- | src/Java/gtPlusPlus/core/util/item/ItemUtils.java | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/core/util/item/ItemUtils.java b/src/Java/gtPlusPlus/core/util/item/ItemUtils.java index c46a25dae9..1fcfa71fe8 100644 --- a/src/Java/gtPlusPlus/core/util/item/ItemUtils.java +++ b/src/Java/gtPlusPlus/core/util/item/ItemUtils.java @@ -565,20 +565,38 @@ public class ItemUtils { return getModId(key.getItem()); } - //Take 2 - GT Dusts + //Take 2 - GT/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){ + if (modid.equals("gregtech") || modid.equals(CORE.MODID)){ returnvalue = oreDictList.get(xrc).copy(); returnvalue.stackSize = amount; return returnvalue; } } } + 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); + if (!oreDictList.isEmpty()){ + ItemStack returnvalue; + for (int xrc=0;xrc<oreDictList.size();xrc++){ + String modid = getModId(oreDictList.get(xrc).getItem()); + if (!modid.equals("tconstruct")){ + returnvalue = oreDictList.get(xrc).copy(); + returnvalue.stackSize = amount; + return returnvalue; + } + } + } + //If only Tinkers dust exists, bow down and just use it. return getItemStackOfAmountFromOreDictNoBroken(oredictName, amount); } |