From f354f6c08a364f8d987f4f820b35aa16fe4f3be6 Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Fri, 17 Jan 2020 15:58:26 +0000 Subject: + Added a new Catalyst (Platinum + Rhodium). + Added simple functions to CI for obtaining catalysts. % Improved Catalyst handling across the board. $ Fixed Pyromatic 'mode' handling. --- src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java | 3 +++ src/Java/gtPlusPlus/core/util/minecraft/NBTUtils.java | 11 +++++++++++ 2 files changed, 14 insertions(+) (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 9f5f374108..2ed4532d18 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java +++ b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java @@ -1337,6 +1337,9 @@ public class ItemUtils { if (GT_Utility.areStacksEqual(aStack, GenericChem.mYellowCatalyst, true)) { return true; } + if (GT_Utility.areStacksEqual(aStack, GenericChem.mPinkCatalyst, true)) { + return true; + } if (GT_Utility.areStacksEqual(aStack, AgriculturalChem.mGreenCatalyst, true)) { return true; } diff --git a/src/Java/gtPlusPlus/core/util/minecraft/NBTUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/NBTUtils.java index 66abbded15..b0623d429d 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/NBTUtils.java +++ b/src/Java/gtPlusPlus/core/util/minecraft/NBTUtils.java @@ -464,4 +464,15 @@ public class NBTUtils { return ReflectionUtils.setField(aEntity, "customEntityData", aTag); } + public static boolean hasTagCompound(ItemStack aStack) { + return aStack.hasTagCompound(); + } + + public static void createEmptyTagCompound(ItemStack aStack) { + if (!hasTagCompound(aStack)) { + NBTTagCompound aTag = new NBTTagCompound(); + aStack.setTagCompound(aTag); + } + } + } -- cgit