From 0d1324c45d68d18b5b2fcccd64f5519394700982 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 19 Feb 2017 21:37:05 -0600 Subject: [PATCH] Minor clean up ItemNBTHelper --- .../client/core/handler/TooltipHandler.java | 2 +- .../common/core/helper/ItemNBTHelper.java | 22 ++----------------- .../common/crafting/recipe/KeepIvyRecipe.java | 2 +- .../botania/common/item/ItemKeepIvy.java | 2 +- .../item/block/ItemBlockSpecialFlower.java | 2 +- 5 files changed, 6 insertions(+), 24 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java b/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java index 7bc70254e..0df7d514e 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java @@ -21,7 +21,7 @@ public final class TooltipHandler { @SubscribeEvent(priority = EventPriority.HIGHEST) public static void onTooltipEvent(ItemTooltipEvent event) { - if(ItemNBTHelper.detectNBT(event.getItemStack()) && ItemNBTHelper.getBoolean(event.getItemStack(), ItemKeepIvy.TAG_KEEP, false)) + if(event.getItemStack().hasTagCompound() && ItemNBTHelper.getBoolean(event.getItemStack(), ItemKeepIvy.TAG_KEEP, false)) event.getToolTip().add(I18n.format("botaniamisc.hasKeepIvy")); } diff --git a/src/main/java/vazkii/botania/common/core/helper/ItemNBTHelper.java b/src/main/java/vazkii/botania/common/core/helper/ItemNBTHelper.java index 4a43c7128..14e427de7 100644 --- a/src/main/java/vazkii/botania/common/core/helper/ItemNBTHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/ItemNBTHelper.java @@ -21,29 +21,11 @@ public final class ItemNBTHelper { private static final int[] EMPTY_INT_ARRAY = new int[0]; - /** Checks if an ItemStack has a Tag Compound **/ - public static boolean detectNBT(ItemStack stack) { - return stack.hasTagCompound(); - } - - /** Tries to initialize an NBT Tag Compound in an ItemStack, - * this will not do anything if the stack already has a tag - * compound **/ - public static void initNBT(ItemStack stack) { - if(!detectNBT(stack)) - injectNBT(stack, new NBTTagCompound()); - } - - /** Injects an NBT Tag Compound to an ItemStack, no checks - * are made previously **/ - public static void injectNBT(ItemStack stack, NBTTagCompound nbt) { - stack.setTagCompound(nbt); - } - /** Gets the NBTTagCompound in an ItemStack. Tries to init it * previously in case there isn't one present **/ public static NBTTagCompound getNBT(ItemStack stack) { - initNBT(stack); + if(!stack.hasTagCompound()) + stack.setTagCompound(new NBTTagCompound()); return stack.getTagCompound(); } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java index 175f2aa30..1ef87b0e1 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java @@ -34,7 +34,7 @@ public class KeepIvyRecipe implements IRecipe { if(!stack.isEmpty()) { if(stack.getItem() == ModItems.keepIvy) foundIvy = true; - else if(!foundItem && !(ItemNBTHelper.detectNBT(stack) && ItemNBTHelper.getBoolean(stack, ItemKeepIvy.TAG_KEEP, false)) && !stack.getItem().hasContainerItem(stack)) + else if(!foundItem && !(stack.hasTagCompound() && ItemNBTHelper.getBoolean(stack, ItemKeepIvy.TAG_KEEP, false)) && !stack.getItem().hasContainerItem(stack)) foundItem = true; else return false; } diff --git a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java index 1eab20cba..53c80a73c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java +++ b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java @@ -48,7 +48,7 @@ public class ItemKeepIvy extends ItemMod { List keeps = new ArrayList<>(); for(EntityItem item : event.getDrops()) { ItemStack stack = item.getEntityItem(); - if(!stack.isEmpty() && ItemNBTHelper.detectNBT(stack) && ItemNBTHelper.getBoolean(stack, TAG_KEEP, false)) + if(!stack.isEmpty() && stack.hasTagCompound() && ItemNBTHelper.getBoolean(stack, TAG_KEEP, false)) keeps.add(item); } diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index 97c97b459..42dd745d9 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -101,7 +101,7 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr } public static String getType(ItemStack stack) { - return ItemNBTHelper.detectNBT(stack) ? ItemNBTHelper.getString(stack, SubTileEntity.TAG_TYPE, "") : ""; + return stack.hasTagCompound() ? ItemNBTHelper.getString(stack, SubTileEntity.TAG_TYPE, "") : ""; } public static ItemStack ofType(String type) {