lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix client having NBT that the server doesn't

Browse source 
This was reported months ago but I forgot because it was in the WRONG PLACE.
This commit is contained in:
Nicholas Ignoffo 2016-09-06 18:55:32 -07:00
parent 137975331c
commit 09b331fdbe
31 changed files with 66 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java
View file

@ -51,7 +51,8 @@ public class ItemAltarMaker extends Item implements IAltarManipulator, IVariantP
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> 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));
}

3
src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java
View file

@ -26,7 +26,8 @@ public class ItemBindableBase extends ItemBindable
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, EntityPlayer player, List<String> 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)));

3
src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java
View file

@ -97,7 +97,8 @@ public class ItemBoundSword extends ItemSword implements IBindable, IActivatable
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, EntityPlayer player, List<String> 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"));

3
src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java
View file

@ -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)));

19
src/main/java/WayofTime/bloodmagic/item/ItemBucketEssence.java
View file

@ -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);
}
}

4
src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java
View file

@ -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)));
}

3
src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java
View file

@ -232,6 +232,9 @@ public class ItemRitualDiviner extends Item implements IVariantProvider
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced)
{
if (!stack.hasTagCompound())
return;
Ritual ritual = RitualRegistry.getRitualForId(this.getCurrentRitual(stack));
if (ritual != null)
{

3
src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java
View file

@ -49,7 +49,8 @@ public class ItemRitualReader extends Item implements IVariantProvider
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, EntityPlayer player, List<String> 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())));

3
src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java
View file

@ -108,7 +108,8 @@ public class ItemSanguineBook extends Item implements IVariantProvider, IAltarMa
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> 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));

3
src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java
View file

@ -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);

2
src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java
View file

@ -104,6 +104,8 @@ public class ItemUpgradeTome extends Item implements IVariantProvider
public void addInformation(ItemStack stack, EntityPlayer player, List<String> 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)
{

2
src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java
View file

@ -52,6 +52,8 @@ public class ItemUpgradeTrainer extends Item implements IUpgradeTrainer, IVarian
public void addInformation(ItemStack stack, EntityPlayer player, List<String> 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)
{

2
src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java
View file

@ -47,6 +47,8 @@ public class ItemCuttingFluid extends Item implements IVariantProvider, ICustomA
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced)
{
if (!stack.hasTagCompound())
return;
int max = getMaxUsesForFluid(stack);
tooltip.add(TextHelper.localize("tooltip.BloodMagic.cuttingFluidRatio", max - getDamageOfFluid(stack), max));
}

3
src/main/java/WayofTime/bloodmagic/item/alchemy/ItemLivingArmourPointsUpgrade.java
View file

@ -56,7 +56,8 @@ public class ItemLivingArmourPointsUpgrade extends Item implements IVariantProvi
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced)
{
NBTHelper.checkNBT(stack);
if (!stack.hasTagCompound())
return;
tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.BloodMagic.livingArmourPointsUpgrade.desc", 200))));
}

3
src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java
View file

@ -262,7 +262,8 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced)
{
stack = NBTHelper.checkNBT(stack);
if (!stack.hasTagCompound())
return;
if (this == ModItems.livingArmourChest)
{

13
src/main/java/WayofTime/bloodmagic/item/block/ItemBlockRoutingNode.java
View file

@ -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);
}
}

4
src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java
View file

@ -74,7 +74,9 @@ public class ItemPackSacrifice extends ItemArmor implements IAltarManipulator, I
@Override
public void addInformation(ItemStack stack, EntityPlayer player, List<String> 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)));
}

3
src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java
View file

@ -101,7 +101,8 @@ public class ItemPackSelfSacrifice extends ItemArmor implements IAltarManipulato
@Override
public void addInformation(ItemStack stack, EntityPlayer player, List<String> 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)));
}

3
src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java
View file

@ -41,7 +41,8 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced)
{
stack = NBTHelper.checkNBT(stack);
if (!stack.hasTagCompound())
return;
NBTTagCompound tag = stack.getTagCompound();
BlockPos coords = getBlockPos(stack);

3
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java
View file

@ -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)));

3
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java
View file

@ -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)

3
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java
View file

@ -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))

3
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java
View file

@ -43,8 +43,9 @@ public class ItemSigilToggleableBase extends ItemSigilToggleable implements IMes
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, EntityPlayer player, List<String> 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)))

3
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java
View file

@ -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))

2
src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java
View file

@ -51,6 +51,8 @@ public class ItemMonsterSoul extends Item implements IDemonWill, IVariantProvide
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced)
{
if (!stack.hasTagCompound())
return;
tooltip.add(TextHelper.localize("tooltip.BloodMagic.will", getWill(stack)));
super.addInformation(stack, player, tooltip, advanced);

4
src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java
View file

@ -307,10 +307,10 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, EntityPlayer player, List<String> 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()));
}

4
src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java
View file

@ -307,10 +307,10 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, EntityPlayer player, List<String> 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()));
}

4
src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java
View file

@ -307,10 +307,10 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, EntityPlayer player, List<String> 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()));
}

4
src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java
View file

@ -279,10 +279,10 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, EntityPlayer player, List<String> 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()));
}

3
src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java
View file

@ -117,6 +117,9 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, EntityPlayer player, List<String> 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)));

9
src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java
View file

@ -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());