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

Moved living armor notifications to action bar

Browse source
This commit is contained in:
Nicholas Ignoffo 2017-05-27 16:04:40 -07:00
parent 38e54a4e2f
commit 6656fe58dc
5 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -158,7 +158,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
ItemStack leggings = player.getItemStackFromSlot(EntityEquipmentSlot.LEGS); ItemStack leggings = player.getItemStackFromSlot(EntityEquipmentSlot.LEGS);
ItemStack boots = player.getItemStackFromSlot(EntityEquipmentSlot.FEET); ItemStack boots = player.getItemStackFromSlot(EntityEquipmentSlot.FEET);
if (helmet == null || leggings == null || boots == null) if (helmet.isEmpty() || leggings.isEmpty() || boots.isEmpty())
{ {
damageAmount *= (armourReduction); damageAmount *= (armourReduction);

3
src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java
View file

@ -13,6 +13,7 @@ import net.minecraft.inventory.EntityEquipmentSlot;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagList;
import net.minecraft.util.text.TextComponentString;
import net.minecraft.world.World; import net.minecraft.world.World;
import WayofTime.bloodmagic.api.iface.IUpgradeTrainer; import WayofTime.bloodmagic.api.iface.IUpgradeTrainer;
import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
@ -175,7 +176,7 @@ public class LivingArmour implements ILivingArmour
@Override @Override
public void notifyPlayerOfUpgrade(EntityPlayer user, LivingArmourUpgrade upgrade) public void notifyPlayerOfUpgrade(EntityPlayer user, LivingArmourUpgrade upgrade)
{ {
ChatUtil.sendChat(user, TextHelper.localizeEffect(chatBase + "newUpgrade")); user.sendStatusMessage(new TextComponentString(TextHelper.localizeEffect(chatBase + "newUpgrade")), true);
} }
/** /**

3
src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java
View file

@ -4,6 +4,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.MobEffects; import net.minecraft.init.MobEffects;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.PotionEffect; import net.minecraft.potion.PotionEffect;
import net.minecraft.util.text.TextComponentString;
import net.minecraft.world.World; import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; 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])); player.addPotionEffect(new PotionEffect(MobEffects.FIRE_RESISTANCE, fireResistDuration[this.level]));
fireCooldown = fireCooldownTime[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) } else if (fireCooldown > 0)
{ {

3
src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java
View file

@ -4,6 +4,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.MobEffects; import net.minecraft.init.MobEffects;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.PotionEffect; import net.minecraft.potion.PotionEffect;
import net.minecraft.util.text.TextComponentString;
import net.minecraft.world.World; import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
@ -90,7 +91,7 @@ public class LivingArmourUpgradeGrimReaperSprint extends LivingArmourUpgrade
} }
deathTimer = rebirthDelay[this.level]; 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) public boolean canSavePlayer(EntityPlayer player)

3
src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java
View file

@ -4,6 +4,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.MobEffects; import net.minecraft.init.MobEffects;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.PotionEffect; import net.minecraft.potion.PotionEffect;
import net.minecraft.util.text.TextComponentString;
import net.minecraft.world.World; import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
@ -35,7 +36,7 @@ public class LivingArmourUpgradePoisonResist extends LivingArmourUpgrade
player.removePotionEffect(MobEffects.POISON); player.removePotionEffect(MobEffects.POISON);
poisonCooldown = poisonCooldownTime[this.level]; poisonCooldown = poisonCooldownTime[this.level];
ChatUtil.sendNoSpam(player, TextHelper.localize(chatBase + "poisonRemove")); player.sendStatusMessage(new TextComponentString(TextHelper.localize(chatBase + "poisonRemove")), true);
} }
} else if (poisonCooldown > 0) } else if (poisonCooldown > 0)
{ {