From 09b331fdbe973fa494925bd551d9c0c9f6a300ab Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 6 Sep 2016 18:55:32 -0700 Subject: [PATCH] Fix client having NBT that the server doesn't This was reported months ago but I forgot because it was in the WRONG PLACE. --- .../bloodmagic/item/ItemAltarMaker.java | 3 ++- .../bloodmagic/item/ItemBindableBase.java | 3 ++- .../bloodmagic/item/ItemBoundSword.java | 3 ++- .../bloodmagic/item/ItemBoundTool.java | 3 ++- .../bloodmagic/item/ItemBucketEssence.java | 19 ------------------- .../bloodmagic/item/ItemExperienceBook.java | 4 +++- .../bloodmagic/item/ItemRitualDiviner.java | 3 +++ .../bloodmagic/item/ItemRitualReader.java | 3 ++- .../bloodmagic/item/ItemSanguineBook.java | 3 ++- .../item/ItemTelepositionFocus.java | 3 +++ .../bloodmagic/item/ItemUpgradeTome.java | 2 ++ .../bloodmagic/item/ItemUpgradeTrainer.java | 2 ++ .../item/alchemy/ItemCuttingFluid.java | 2 ++ .../ItemLivingArmourPointsUpgrade.java | 3 ++- .../item/armour/ItemLivingArmour.java | 3 ++- .../item/block/ItemBlockRoutingNode.java | 13 ------------- .../item/gear/ItemPackSacrifice.java | 4 +++- .../item/gear/ItemPackSelfSacrifice.java | 3 ++- .../item/routing/ItemNodeRouter.java | 3 ++- .../bloodmagic/item/sigil/ItemSigilBase.java | 3 ++- .../item/sigil/ItemSigilHolding.java | 3 +++ .../item/sigil/ItemSigilTeleposition.java | 3 ++- .../item/sigil/ItemSigilToggleableBase.java | 3 ++- .../item/sigil/ItemSigilTransposition.java | 3 ++- .../bloodmagic/item/soul/ItemMonsterSoul.java | 2 ++ .../bloodmagic/item/soul/ItemSentientAxe.java | 4 ++-- .../item/soul/ItemSentientPickaxe.java | 4 ++-- .../item/soul/ItemSentientShovel.java | 4 ++-- .../item/soul/ItemSentientSword.java | 4 ++-- .../bloodmagic/item/soul/ItemSoulGem.java | 3 +++ .../bloodmagic/registry/ModBlocks.java | 9 ++++----- 31 files changed, 66 insertions(+), 61 deletions(-) delete mode 100644 src/main/java/WayofTime/bloodmagic/item/ItemBucketEssence.java delete mode 100644 src/main/java/WayofTime/bloodmagic/item/block/ItemBlockRoutingNode.java diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java index f26f19e7..74ad1c20 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java @@ -51,7 +51,8 @@ public class ItemAltarMaker extends Item implements IAltarManipulator, IVariantP @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { - stack = NBTHelper.checkNBT(stack); + if (!stack.hasTagCompound()) + return; tooltip.add(TextHelper.localizeEffect("tooltip.BloodMagic.currentTier", stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER) + 1)); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java b/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java index df9508e9..686d4ba0 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java @@ -26,7 +26,8 @@ public class ItemBindableBase extends ItemBindable @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { - NBTHelper.checkNBT(stack); + if (!stack.hasTagCompound()) + return; if (!Strings.isNullOrEmpty(getOwnerUUID(stack))) tooltip.add(TextHelper.localizeEffect("tooltip.BloodMagic.currentOwner", PlayerHelper.getUsernameFromStack(stack))); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java index 6ae1ace3..8424fc79 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java @@ -97,7 +97,8 @@ public class ItemBoundSword extends ItemSword implements IBindable, IActivatable @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { - NBTHelper.checkNBT(stack); + if (!stack.hasTagCompound()) + return; if (TextHelper.canTranslate("tooltip.BloodMagic.bound.sword.desc")) tooltip.add(TextHelper.localizeEffect("tooltip.BloodMagic.bound.sword.desc")); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java index 3fb1beb3..78a7a6ee 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java @@ -203,7 +203,8 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable tooltip.add(TextHelper.localize("tooltip.BloodMagic." + (getActivated(stack) ? "activated" : "deactivated"))); - NBTHelper.checkNBT(stack); + if (!stack.hasTagCompound()) + return; if (!Strings.isNullOrEmpty(getOwnerUUID(stack))) tooltip.add(TextHelper.localizeEffect("tooltip.BloodMagic.currentOwner", PlayerHelper.getUsernameFromStack(stack))); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBucketEssence.java b/src/main/java/WayofTime/bloodmagic/item/ItemBucketEssence.java deleted file mode 100644 index 0cb383ed..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBucketEssence.java +++ /dev/null @@ -1,19 +0,0 @@ -package WayofTime.bloodmagic.item; - -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.registry.ModBlocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemBucket; - -public class ItemBucketEssence extends ItemBucket -{ - public ItemBucketEssence() - { - super(ModBlocks.lifeEssence); - - setUnlocalizedName(Constants.Mod.MODID + ".bucket.lifeEssence"); - setContainerItem(Items.BUCKET); - setCreativeTab(BloodMagic.tabBloodMagic); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java b/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java index 3dddfdce..8d0063f9 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java @@ -46,10 +46,12 @@ public class ItemExperienceBook extends Item implements IVariantProvider { tooltip.add(TextHelper.localizeEffect("tooltip.BloodMagic.experienceTome")); + if (!stack.hasTagCompound()) + return; + double storedExp = getStoredExperience(stack); tooltip.add(TextHelper.localizeEffect("tooltip.BloodMagic.experienceTome.exp", (int) storedExp)); - tooltip.add(TextHelper.localizeEffect("tooltip.BloodMagic.experienceTome.expLevel", (int) getLevelForExperience(storedExp))); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java index 49f874d0..011cd005 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java @@ -232,6 +232,9 @@ public class ItemRitualDiviner extends Item implements IVariantProvider @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + if (!stack.hasTagCompound()) + return; + Ritual ritual = RitualRegistry.getRitualForId(this.getCurrentRitual(stack)); if (ritual != null) { diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java index 227395fc..12ef782b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java @@ -49,7 +49,8 @@ public class ItemRitualReader extends Item implements IVariantProvider @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { - NBTHelper.checkNBT(stack); + if (!stack.hasTagCompound()) + return; EnumRitualReaderState state = this.getState(stack); tooltip.add(TextHelper.localizeEffect(tooltipBase + "currentState", TextHelper.localizeEffect(tooltipBase + state.toString().toLowerCase()))); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java b/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java index 62160f90..4fb5aa1d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java @@ -108,7 +108,8 @@ public class ItemSanguineBook extends Item implements IVariantProvider, IAltarMa @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { - stack = NBTHelper.checkNBT(stack); + if (!stack.hasTagCompound()) + return; tooltip.add(TextHelper.localizeEffect("tooltip.BloodMagic.book.shifting")); tooltip.add(TextFormatting.OBFUSCATED + "~ILikeTehNutsAndICannotLie"); tooltip.add(TextHelper.localizeEffect("tooltip.BloodMagic.currentTier", stack.getTagCompound().getInteger(Constants.NBT.ALTARMAKER_CURRENT_TIER) + 1)); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java b/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java index f59ca871..e717c234 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java @@ -77,6 +77,9 @@ public class ItemTelepositionFocus extends ItemBindableBase implements IVariantP super.addInformation(stack, player, tooltip, advanced); + if (!stack.hasTagCompound()) + return; + stack = NBTHelper.checkNBT(stack); NBTTagCompound tag = stack.getTagCompound(); BlockPos coords = getBlockPos(stack); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java index dde53cbb..63c83d4c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java @@ -104,6 +104,8 @@ public class ItemUpgradeTome extends Item implements IVariantProvider public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { // tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.BloodMagic.livingArmour")))); + if (!stack.hasTagCompound()) + return; LivingArmourUpgrade upgrade = LivingUpgrades.getUpgrade(stack); if (upgrade != null) { diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java index bb3f5d5d..df338564 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java @@ -52,6 +52,8 @@ public class ItemUpgradeTrainer extends Item implements IUpgradeTrainer, IVarian public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { // tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.BloodMagic.livingArmour")))); + if (!stack.hasTagCompound()) + return; LivingArmourUpgrade upgrade = LivingUpgrades.getUpgrade(stack); if (upgrade != null) { diff --git a/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java b/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java index a4652c5c..eee95bf7 100644 --- a/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java +++ b/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java @@ -47,6 +47,8 @@ public class ItemCuttingFluid extends Item implements IVariantProvider, ICustomA @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + if (!stack.hasTagCompound()) + return; int max = getMaxUsesForFluid(stack); tooltip.add(TextHelper.localize("tooltip.BloodMagic.cuttingFluidRatio", max - getDamageOfFluid(stack), max)); } diff --git a/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemLivingArmourPointsUpgrade.java b/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemLivingArmourPointsUpgrade.java index b96846b0..02b64f85 100644 --- a/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemLivingArmourPointsUpgrade.java +++ b/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemLivingArmourPointsUpgrade.java @@ -56,7 +56,8 @@ public class ItemLivingArmourPointsUpgrade extends Item implements IVariantProvi @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { - NBTHelper.checkNBT(stack); + if (!stack.hasTagCompound()) + return; tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.BloodMagic.livingArmourPointsUpgrade.desc", 200)))); } diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java index 3c7286ca..85e15797 100644 --- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java @@ -262,7 +262,8 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { - stack = NBTHelper.checkNBT(stack); + if (!stack.hasTagCompound()) + return; if (this == ModItems.livingArmourChest) { diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockRoutingNode.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockRoutingNode.java deleted file mode 100644 index 61079204..00000000 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockRoutingNode.java +++ /dev/null @@ -1,13 +0,0 @@ -package WayofTime.bloodmagic.item.block; - -import WayofTime.bloodmagic.api.iface.INodeRenderer; -import net.minecraft.block.Block; -import net.minecraft.item.ItemBlock; - -public class ItemBlockRoutingNode extends ItemBlock implements INodeRenderer -{ - public ItemBlockRoutingNode(Block block) - { - super(block); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java index 6c1bd605..0ea4f2e8 100644 --- a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java @@ -74,7 +74,9 @@ public class ItemPackSacrifice extends ItemArmor implements IAltarManipulator, I @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean advanced) { - stack = NBTHelper.checkNBT(stack); + if (!stack.hasTagCompound()) + return; + list.add(TextHelper.localize("tooltip.BloodMagic.pack.sacrifice.desc")); list.add(TextHelper.localize("tooltip.BloodMagic.pack.stored", getStoredLP(stack))); } diff --git a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java index 4e77b95d..d5c74e74 100644 --- a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java @@ -101,7 +101,8 @@ public class ItemPackSelfSacrifice extends ItemArmor implements IAltarManipulato @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean advanced) { - stack = NBTHelper.checkNBT(stack); + if (!stack.hasTagCompound()) + return; list.add(TextHelper.localize("tooltip.BloodMagic.pack.selfSacrifice.desc")); list.add(TextHelper.localize("tooltip.BloodMagic.pack.stored", getStoredLP(stack))); } diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java index 543b28d5..d3e96eac 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java @@ -41,7 +41,8 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { - stack = NBTHelper.checkNBT(stack); + if (!stack.hasTagCompound()) + return; NBTTagCompound tag = stack.getTagCompound(); BlockPos coords = getBlockPos(stack); diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java index b737a693..99c4ea50 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java @@ -51,7 +51,8 @@ public class ItemSigilBase extends ItemSigil implements IVariantProvider if (TextHelper.canTranslate(tooltipBase + "desc")) tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect(tooltipBase + "desc")))); - NBTHelper.checkNBT(stack); + if (!stack.hasTagCompound()) + return; if (!Strings.isNullOrEmpty(getOwnerName(stack))) tooltip.add(TextHelper.localizeEffect("tooltip.BloodMagic.currentOwner", PlayerHelper.getUsernameFromStack(stack))); diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java index 40a81fba..15be8107 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java @@ -75,6 +75,9 @@ public class ItemSigilHolding extends ItemSigilBase implements IKeybindable, IAl super.addInformation(stack, player, tooltip, advanced); tooltip.add(TextHelper.localizeEffect("tooltip.BloodMagic.sigil.holding.press", KeyBindingBloodMagic.KeyBindings.OPEN_HOLDING.getKey().getDisplayName())); + if (!stack.hasTagCompound()) + return; + ItemStack[] inv = getInternalInventory(stack); if (inv == null) diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java index ba1daf89..825ea25f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java @@ -33,7 +33,8 @@ public class ItemSigilTeleposition extends ItemSigilBase { super.addInformation(stack, player, tooltip, advanced); - stack = NBTHelper.checkNBT(stack); + if (!stack.hasTagCompound()) + return; NBTTagCompound tag = stack.getTagCompound(); if (tag != null && stack.getTagCompound().hasKey(Constants.NBT.DIMENSION_ID) && stack.getTagCompound().hasKey(Constants.NBT.X_COORD) && stack.getTagCompound().hasKey(Constants.NBT.Y_COORD) && stack.getTagCompound().hasKey(Constants.NBT.Z_COORD)) diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java index d2afc11c..26a98b4f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java @@ -43,8 +43,9 @@ public class ItemSigilToggleableBase extends ItemSigilToggleable implements IMes @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { - NBTHelper.checkNBT(stack); super.addInformation(stack, player, tooltip, advanced); + if (!stack.hasTagCompound()) + return; tooltip.add(TextHelper.localizeEffect("tooltip.BloodMagic." + (getActivated(stack) ? "activated" : "deactivated"))); if (!Strings.isNullOrEmpty(getOwnerName(stack))) diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java index 3f51d883..3746b32f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java @@ -39,7 +39,8 @@ public class ItemSigilTransposition extends ItemSigilBase { super.addInformation(stack, player, tooltip, advanced); - stack = NBTHelper.checkNBT(stack); + if (!stack.hasTagCompound()) + return; NBTTagCompound tag = stack.getTagCompound(); if (tag.hasKey(Constants.NBT.CONTAINED_BLOCK_NAME) && tag.hasKey(Constants.NBT.CONTAINED_BLOCK_META)) diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java index 28361a4d..2b855d32 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java @@ -51,6 +51,8 @@ public class ItemMonsterSoul extends Item implements IDemonWill, IVariantProvide @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + if (!stack.hasTagCompound()) + return; tooltip.add(TextHelper.localize("tooltip.BloodMagic.will", getWill(stack))); super.addInformation(stack, player, tooltip, advanced); diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java index 92da6357..04e5606b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java @@ -307,10 +307,10 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { - NBTHelper.checkNBT(stack); + if (!stack.hasTagCompound()) + return; tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.BloodMagic.sentientAxe.desc")))); - tooltip.add(TextHelper.localizeEffect("tooltip.BloodMagic.currentType." + getCurrentType(stack).getName().toLowerCase())); } diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java index 7b226c63..fd50f7c7 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java @@ -307,10 +307,10 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { - NBTHelper.checkNBT(stack); + if (!stack.hasTagCompound()) + return; tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.BloodMagic.sentientPickaxe.desc")))); - tooltip.add(TextHelper.localizeEffect("tooltip.BloodMagic.currentType." + getCurrentType(stack).getName().toLowerCase())); } diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java index 888f5b31..652fc4a2 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java @@ -307,10 +307,10 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { - NBTHelper.checkNBT(stack); + if (!stack.hasTagCompound()) + return; tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.BloodMagic.sentientShovel.desc")))); - tooltip.add(TextHelper.localizeEffect("tooltip.BloodMagic.currentType." + getCurrentType(stack).getName().toLowerCase())); } diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java index 80b7b44f..9d099169 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java @@ -279,10 +279,10 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { - NBTHelper.checkNBT(stack); + if (!stack.hasTagCompound()) + return; tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.BloodMagic.sentientSword.desc")))); - tooltip.add(TextHelper.localizeEffect("tooltip.BloodMagic.currentType." + getCurrentType(stack).getName().toLowerCase())); } diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java index d4d3afbf..69247742 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java @@ -117,6 +117,9 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + if (!stack.hasTagCompound()) + return; + EnumDemonWillType type = this.getCurrentType(stack); tooltip.add(TextHelper.localize("tooltip.BloodMagic.soulGem." + names[stack.getItemDamage()])); tooltip.add(TextHelper.localize("tooltip.BloodMagic.will", getWill(type, stack))); diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java b/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java index 6b8795ca..d526c844 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java @@ -61,7 +61,6 @@ import WayofTime.bloodmagic.item.block.ItemBlockPath; import WayofTime.bloodmagic.item.block.ItemBlockPedestal; import WayofTime.bloodmagic.item.block.ItemBlockRitualController; import WayofTime.bloodmagic.item.block.ItemBlockRitualStone; -import WayofTime.bloodmagic.item.block.ItemBlockRoutingNode; import WayofTime.bloodmagic.item.block.ItemDemonStairsBase; import WayofTime.bloodmagic.tile.TileAlchemyArray; import WayofTime.bloodmagic.tile.TileAlchemyTable; @@ -163,10 +162,10 @@ public class ModBlocks soulForge = registerBlock(new BlockSoulForge(), Constants.BloodMagicBlock.SOUL_FORGE.getRegName()); crystal = registerBlock(new ItemBlockCrystal(new BlockCrystal()), Constants.BloodMagicBlock.CRYSTAL.getRegName()); bloodStoneBrick = registerBlock(new ItemBlockBloodStoneBrick(new BlockBloodStoneBrick()), Constants.BloodMagicBlock.BLOOD_STONE.getRegName()); - masterRoutingNode = registerBlock(new ItemBlockRoutingNode(new BlockMasterRoutingNode()), Constants.BloodMagicBlock.MASTER_ROUTING_NODE.getRegName()); - inputRoutingNode = registerBlock(new ItemBlockRoutingNode(new BlockInputRoutingNode()), Constants.BloodMagicBlock.INPUT_ROUTING_NODE.getRegName()); - outputRoutingNode = registerBlock(new ItemBlockRoutingNode(new BlockOutputRoutingNode()), Constants.BloodMagicBlock.OUTPUT_ROUTING_NODE.getRegName()); - itemRoutingNode = registerBlock(new ItemBlockRoutingNode(new BlockItemRoutingNode()), Constants.BloodMagicBlock.ITEM_ROUTING_NODE.getRegName()); + masterRoutingNode = registerBlock(new ItemBlock(new BlockMasterRoutingNode()), Constants.BloodMagicBlock.MASTER_ROUTING_NODE.getRegName()); + inputRoutingNode = registerBlock(new ItemBlock(new BlockInputRoutingNode()), Constants.BloodMagicBlock.INPUT_ROUTING_NODE.getRegName()); + outputRoutingNode = registerBlock(new ItemBlock(new BlockOutputRoutingNode()), Constants.BloodMagicBlock.OUTPUT_ROUTING_NODE.getRegName()); + itemRoutingNode = registerBlock(new ItemBlock(new BlockItemRoutingNode()), Constants.BloodMagicBlock.ITEM_ROUTING_NODE.getRegName()); incenseAltar = registerBlock(new BlockIncenseAltar(), Constants.BloodMagicBlock.INCENSE_ALTAR.getRegName()); pathBlock = registerBlock(new ItemBlockPath(new BlockPath()), Constants.BloodMagicBlock.PATH.getRegName()); demonCrucible = registerBlock(new BlockDemonCrucible(), Constants.BloodMagicBlock.DEMON_CRUCIBLE.getRegName());