diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2020-01-17 15:58:26 +0000 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2020-01-17 15:58:26 +0000 |
| commit | f354f6c08a364f8d987f4f820b35aa16fe4f3be6 (patch) | |
| tree | 971a2796ab2b14db10977149eaffab0cb5aadead /src/Java/gtPlusPlus/core/util/minecraft | |
| parent | 3f35b4b0183ea16d623cdcf74447a11f4734ce45 (diff) | |
| download | GT5-Unofficial-f354f6c08a364f8d987f4f820b35aa16fe4f3be6.tar.gz GT5-Unofficial-f354f6c08a364f8d987f4f820b35aa16fe4f3be6.tar.bz2 GT5-Unofficial-f354f6c08a364f8d987f4f820b35aa16fe4f3be6.zip | |
+ Added a new Catalyst (Platinum + Rhodium).
+ Added simple functions to CI for obtaining catalysts.
% Improved Catalyst handling across the board.
$ Fixed Pyromatic 'mode' handling.
Diffstat (limited to 'src/Java/gtPlusPlus/core/util/minecraft')
| -rw-r--r-- | src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java | 3 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/util/minecraft/NBTUtils.java | 11 |
2 files changed, 14 insertions, 0 deletions
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); + } + } + } |