From 6656fe58dc2f751674e7576ef09e872568bdc52c Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 27 May 2017 16:04:40 -0700 Subject: [PATCH] Moved living armor notifications to action bar --- .../WayofTime/bloodmagic/item/armour/ItemLivingArmour.java | 2 +- .../java/WayofTime/bloodmagic/livingArmour/LivingArmour.java | 3 ++- .../livingArmour/upgrade/LivingArmourUpgradeFireResist.java | 3 ++- .../upgrade/LivingArmourUpgradeGrimReaperSprint.java | 3 ++- .../livingArmour/upgrade/LivingArmourUpgradePoisonResist.java | 3 ++- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java index 2b9ea2af..71ff29f1 100644 --- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java @@ -158,7 +158,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP ItemStack leggings = player.getItemStackFromSlot(EntityEquipmentSlot.LEGS); ItemStack boots = player.getItemStackFromSlot(EntityEquipmentSlot.FEET); - if (helmet == null || leggings == null || boots == null) + if (helmet.isEmpty() || leggings.isEmpty() || boots.isEmpty()) { damageAmount *= (armourReduction); diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java index 4507ba7e..1986b435 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java @@ -13,6 +13,7 @@ import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import net.minecraft.util.text.TextComponentString; import net.minecraft.world.World; import WayofTime.bloodmagic.api.iface.IUpgradeTrainer; import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; @@ -175,7 +176,7 @@ public class LivingArmour implements ILivingArmour @Override public void notifyPlayerOfUpgrade(EntityPlayer user, LivingArmourUpgrade upgrade) { - ChatUtil.sendChat(user, TextHelper.localizeEffect(chatBase + "newUpgrade")); + user.sendStatusMessage(new TextComponentString(TextHelper.localizeEffect(chatBase + "newUpgrade")), true); } /** diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java index 9733a93a..634f5b3e 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java @@ -4,6 +4,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.PotionEffect; +import net.minecraft.util.text.TextComponentString; import net.minecraft.world.World; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; @@ -33,7 +34,7 @@ public class LivingArmourUpgradeFireResist extends LivingArmourUpgrade player.addPotionEffect(new PotionEffect(MobEffects.FIRE_RESISTANCE, fireResistDuration[this.level])); fireCooldown = fireCooldownTime[this.level]; - ChatUtil.sendNoSpam(player, TextHelper.localizeEffect(chatBase + "fireRemove")); + player.sendStatusMessage(new TextComponentString(TextHelper.localizeEffect(chatBase + "fireRemove")), true); } else if (fireCooldown > 0) { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java index bd600265..7ebd95f1 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java @@ -4,6 +4,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.PotionEffect; +import net.minecraft.util.text.TextComponentString; import net.minecraft.world.World; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; @@ -90,7 +91,7 @@ public class LivingArmourUpgradeGrimReaperSprint extends LivingArmourUpgrade } deathTimer = rebirthDelay[this.level]; - ChatUtil.sendNoSpam(player, TextHelper.localizeEffect(chatBase + "grimReaper")); + player.sendStatusMessage(new TextComponentString(TextHelper.localizeEffect(chatBase + "grimReaper")), true); } public boolean canSavePlayer(EntityPlayer player) diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java index db3b3905..080f7b68 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java @@ -4,6 +4,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.PotionEffect; +import net.minecraft.util.text.TextComponentString; import net.minecraft.world.World; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; @@ -35,7 +36,7 @@ public class LivingArmourUpgradePoisonResist extends LivingArmourUpgrade player.removePotionEffect(MobEffects.POISON); poisonCooldown = poisonCooldownTime[this.level]; - ChatUtil.sendNoSpam(player, TextHelper.localize(chatBase + "poisonRemove")); + player.sendStatusMessage(new TextComponentString(TextHelper.localize(chatBase + "poisonRemove")), true); } } else if (poisonCooldown > 0) {