From 2db96cf18ddf38d1d1dd6709b8be9c03a5dcb056 Mon Sep 17 00:00:00 2001 From: Electroblob77 <35599699+Electroblob77@users.noreply.github.com> Date: Sun, 6 Jan 2019 15:31:48 +0000 Subject: [PATCH] Change spell chat messages to hotbar toast notifications --- src/main/java/electroblob/wizardry/spell/Arc.java | 5 +++-- .../electroblob/wizardry/spell/ChainLightning.java | 5 +++-- .../electroblob/wizardry/spell/Clairvoyance.java | 12 ++++++------ .../java/electroblob/wizardry/spell/Firestorm.java | 5 +++-- .../java/electroblob/wizardry/spell/FlameRay.java | 7 ++++--- src/main/java/electroblob/wizardry/spell/Freeze.java | 4 ++-- .../java/electroblob/wizardry/spell/FrostRay.java | 5 +++-- src/main/java/electroblob/wizardry/spell/Ignite.java | 4 ++-- .../electroblob/wizardry/spell/LightningRay.java | 6 +++--- .../electroblob/wizardry/spell/LightningWeb.java | 6 +++--- .../java/electroblob/wizardry/spell/MindControl.java | 4 ++-- src/main/java/electroblob/wizardry/spell/Poison.java | 4 ++-- src/main/java/electroblob/wizardry/spell/Slime.java | 4 ++-- .../electroblob/wizardry/spell/Transportation.java | 6 +++--- src/main/java/electroblob/wizardry/spell/Wither.java | 4 ++-- 15 files changed, 43 insertions(+), 38 deletions(-) diff --git a/src/main/java/electroblob/wizardry/spell/Arc.java b/src/main/java/electroblob/wizardry/spell/Arc.java index e543790d..4da75483 100644 --- a/src/main/java/electroblob/wizardry/spell/Arc.java +++ b/src/main/java/electroblob/wizardry/spell/Arc.java @@ -39,8 +39,9 @@ public class Arc extends SpellRay { // This is a lot neater than it was, thanks to the damage type system. if(MagicDamage.isEntityImmune(DamageType.SHOCK, target)){ - if(!world.isRemote) caster.sendMessage(new TextComponentTranslation("spell.resist", target.getName(), - this.getNameForTranslationFormatted())); + if(!world.isRemote && caster instanceof EntityPlayer) ((EntityPlayer)caster).sendStatusMessage( + new TextComponentTranslation("spell.resist", + target.getName(), this.getNameForTranslationFormatted()), true); }else{ target.attackEntityFrom(MagicDamage.causeDirectMagicDamage(caster, DamageType.SHOCK), BASE_DAMAGE * modifiers.get(SpellModifiers.POTENCY)); diff --git a/src/main/java/electroblob/wizardry/spell/ChainLightning.java b/src/main/java/electroblob/wizardry/spell/ChainLightning.java index 8e6bfb72..36bfa78d 100644 --- a/src/main/java/electroblob/wizardry/spell/ChainLightning.java +++ b/src/main/java/electroblob/wizardry/spell/ChainLightning.java @@ -96,8 +96,9 @@ public class ChainLightning extends SpellRay { private void electrocute(World world, Entity caster, Entity origin, Entity target, float damage){ if(MagicDamage.isEntityImmune(DamageType.SHOCK, target)){ - if(!world.isRemote) caster.sendMessage(new TextComponentTranslation("spell.resist", target.getName(), - this.getNameForTranslationFormatted())); + if(!world.isRemote && caster instanceof EntityPlayer) ((EntityPlayer)caster).sendStatusMessage( + new TextComponentTranslation("spell.resist", target.getName(), this.getNameForTranslationFormatted()), + true); }else{ target.attackEntityFrom(MagicDamage.causeDirectMagicDamage(caster, DamageType.SHOCK), damage); } diff --git a/src/main/java/electroblob/wizardry/spell/Clairvoyance.java b/src/main/java/electroblob/wizardry/spell/Clairvoyance.java index 0b582f15..870f994a 100644 --- a/src/main/java/electroblob/wizardry/spell/Clairvoyance.java +++ b/src/main/java/electroblob/wizardry/spell/Clairvoyance.java @@ -57,7 +57,7 @@ public class Clairvoyance extends Spell { if(caster.dimension == properties.getClairvoyanceDimension()){ if(properties.getClairvoyanceLocation() != null){ - if(!world.isRemote) caster.sendMessage(new TextComponentTranslation("spell." + this.getUnlocalisedName() + ".searching")); + if(!world.isRemote) caster.sendStatusMessage(new TextComponentTranslation("spell." + this.getUnlocalisedName() + ".searching"), true); EntityZombie arbitraryZombie = new EntityZombie(world){ @Override @@ -96,13 +96,13 @@ public class Clairvoyance extends Spell { } } - if(!world.isRemote) caster.sendMessage(new TextComponentTranslation("spell." + this.getUnlocalisedName() + ".outofrange")); + if(!world.isRemote) caster.sendStatusMessage(new TextComponentTranslation("spell." + this.getUnlocalisedName() + ".outofrange"), true); }else{ - if(!world.isRemote) caster.sendMessage(new TextComponentTranslation("spell." + this.getUnlocalisedName() + ".undefined")); + if(!world.isRemote) caster.sendStatusMessage(new TextComponentTranslation("spell." + this.getUnlocalisedName() + ".undefined"), true); } }else{ - if(!world.isRemote) caster.sendMessage(new TextComponentTranslation("spell." + this.getUnlocalisedName() + ".wrongdimension")); + if(!world.isRemote) caster.sendStatusMessage(new TextComponentTranslation("spell." + this.getUnlocalisedName() + ".wrongdimension"), true); } } @@ -158,8 +158,8 @@ public class Clairvoyance extends Spell { properties.setClairvoyancePoint(pos, event.getWorld().provider.getDimension()); if(!event.getWorld().isRemote){ - event.getEntityPlayer().sendMessage( - new TextComponentTranslation("spell." + Spells.clairvoyance.getUnlocalisedName() + ".confirm", Spells.clairvoyance.getNameForTranslationFormatted())); + event.getEntityPlayer().sendStatusMessage( + new TextComponentTranslation("spell." + Spells.clairvoyance.getUnlocalisedName() + ".confirm", Spells.clairvoyance.getNameForTranslationFormatted()), true); } event.setCanceled(true); diff --git a/src/main/java/electroblob/wizardry/spell/Firestorm.java b/src/main/java/electroblob/wizardry/spell/Firestorm.java index 55bdd341..fc15aa2e 100644 --- a/src/main/java/electroblob/wizardry/spell/Firestorm.java +++ b/src/main/java/electroblob/wizardry/spell/Firestorm.java @@ -67,8 +67,9 @@ public class Firestorm extends SpellRay { if(target instanceof EntityLivingBase){ if(MagicDamage.isEntityImmune(DamageType.FIRE, target)){ - if(!world.isRemote && ticksInUse == 1) caster.sendMessage(new TextComponentTranslation("spell.resist", - target.getName(), this.getNameForTranslationFormatted())); + if(!world.isRemote && ticksInUse == 1 && caster instanceof EntityPlayer) ((EntityPlayer)caster) + .sendStatusMessage(new TextComponentTranslation("spell.resist", target.getName(), + this.getNameForTranslationFormatted()), true); }else{ target.setFire((int)(BASE_DURATION * modifiers.get(WizardryItems.duration_upgrade))); WizardryUtilities.attackEntityWithoutKnockback(target, diff --git a/src/main/java/electroblob/wizardry/spell/FlameRay.java b/src/main/java/electroblob/wizardry/spell/FlameRay.java index 71e686fd..893d9284 100644 --- a/src/main/java/electroblob/wizardry/spell/FlameRay.java +++ b/src/main/java/electroblob/wizardry/spell/FlameRay.java @@ -65,9 +65,10 @@ public class FlameRay extends SpellRay { if(target instanceof EntityLivingBase){ if(MagicDamage.isEntityImmune(DamageType.FIRE, target)){ - if(!world.isRemote && ticksInUse == 1) caster.sendMessage(new TextComponentTranslation("spell.resist", - target.getName(), this.getNameForTranslationFormatted())); - }else { + if(!world.isRemote && ticksInUse == 1 && caster instanceof EntityPlayer) ((EntityPlayer)caster) + .sendStatusMessage(new TextComponentTranslation("spell.resist", target.getName(), + this.getNameForTranslationFormatted()), true); + }else{ target.setFire((int)(BASE_DURATION * modifiers.get(WizardryItems.duration_upgrade))); WizardryUtilities.attackEntityWithoutKnockback(target, MagicDamage.causeDirectMagicDamage(caster, DamageType.FIRE), diff --git a/src/main/java/electroblob/wizardry/spell/Freeze.java b/src/main/java/electroblob/wizardry/spell/Freeze.java index 3347b566..ab335bc6 100644 --- a/src/main/java/electroblob/wizardry/spell/Freeze.java +++ b/src/main/java/electroblob/wizardry/spell/Freeze.java @@ -47,8 +47,8 @@ public class Freeze extends SpellRay { } if(MagicDamage.isEntityImmune(DamageType.FROST, target)){ - if(!world.isRemote) caster.sendMessage(new TextComponentTranslation("spell.resist", target.getName(), - this.getNameForTranslationFormatted())); + if(!world.isRemote && caster instanceof EntityPlayer) ((EntityPlayer)caster).sendStatusMessage( + new TextComponentTranslation("spell.resist", target.getName(), this.getNameForTranslationFormatted()), true); }else{ ((EntityLivingBase)target).addPotionEffect(new PotionEffect(WizardryPotions.frost, (int)(BASE_DURATION * modifiers.get(WizardryItems.duration_upgrade)), 1)); diff --git a/src/main/java/electroblob/wizardry/spell/FrostRay.java b/src/main/java/electroblob/wizardry/spell/FrostRay.java index 47c36b37..6aa97807 100644 --- a/src/main/java/electroblob/wizardry/spell/FrostRay.java +++ b/src/main/java/electroblob/wizardry/spell/FrostRay.java @@ -70,8 +70,9 @@ public class FrostRay extends SpellRay { if(target.isBurning()) target.extinguish(); if(MagicDamage.isEntityImmune(DamageType.FROST, target)){ - if(!world.isRemote && ticksInUse == 1) caster.sendMessage(new TextComponentTranslation("spell.resist", - target.getName(), this.getNameForTranslationFormatted())); + if(!world.isRemote && ticksInUse == 1 && caster instanceof EntityPlayer) ((EntityPlayer)caster) + .sendStatusMessage(new TextComponentTranslation("spell.resist", target.getName(), + this.getNameForTranslationFormatted()), true); }else{ // For frost ray the entity can move slightly, unlike freeze ((EntityLivingBase)target).addPotionEffect(new PotionEffect(WizardryPotions.frost, diff --git a/src/main/java/electroblob/wizardry/spell/Ignite.java b/src/main/java/electroblob/wizardry/spell/Ignite.java index 145607f3..0acbe1c5 100644 --- a/src/main/java/electroblob/wizardry/spell/Ignite.java +++ b/src/main/java/electroblob/wizardry/spell/Ignite.java @@ -33,8 +33,8 @@ public class Ignite extends SpellRay { if(target instanceof EntityLivingBase) { if(MagicDamage.isEntityImmune(DamageType.FIRE, target)){ - if(!world.isRemote) caster.sendMessage(new TextComponentTranslation("spell.resist", target.getName(), - this.getNameForTranslationFormatted())); + if(!world.isRemote && caster instanceof EntityPlayer) ((EntityPlayer)caster).sendStatusMessage( + new TextComponentTranslation("spell.resist", target.getName(), this.getNameForTranslationFormatted()), true); }else{ target.setFire((int)(BASE_DURATION * modifiers.get(WizardryItems.duration_upgrade))); } diff --git a/src/main/java/electroblob/wizardry/spell/LightningRay.java b/src/main/java/electroblob/wizardry/spell/LightningRay.java index 3521b3d5..ce6ddd15 100644 --- a/src/main/java/electroblob/wizardry/spell/LightningRay.java +++ b/src/main/java/electroblob/wizardry/spell/LightningRay.java @@ -62,9 +62,9 @@ public class LightningRay extends SpellRay { if(WizardryUtilities.isLiving(target)){ if(MagicDamage.isEntityImmune(DamageType.SHOCK, target)){ - if(!world.isRemote && ticksInUse == 1) - caster.sendMessage(new TextComponentTranslation("spell.resist", target.getName(), - this.getNameForTranslationFormatted())); + if(!world.isRemote && ticksInUse == 1 && caster instanceof EntityPlayer) + ((EntityPlayer)caster).sendStatusMessage(new TextComponentTranslation("spell.resist", target.getName(), + this.getNameForTranslationFormatted()), true); }else{ WizardryUtilities.attackEntityWithoutKnockback(target, MagicDamage.causeDirectMagicDamage(caster, DamageType.SHOCK), diff --git a/src/main/java/electroblob/wizardry/spell/LightningWeb.java b/src/main/java/electroblob/wizardry/spell/LightningWeb.java index 8f5f1256..cdc11ea2 100644 --- a/src/main/java/electroblob/wizardry/spell/LightningWeb.java +++ b/src/main/java/electroblob/wizardry/spell/LightningWeb.java @@ -143,9 +143,9 @@ public class LightningWeb extends SpellRay { private void electrocute(World world, Entity caster, Entity origin, Entity target, float damage, int ticksInUse){ if(MagicDamage.isEntityImmune(DamageType.SHOCK, target)){ - if(!world.isRemote && ticksInUse == 1) - caster.sendMessage(new TextComponentTranslation("spell.resist", - target.getName(), this.getNameForTranslationFormatted())); + if(!world.isRemote && ticksInUse == 1 && caster instanceof EntityPlayer) + ((EntityPlayer)caster).sendStatusMessage(new TextComponentTranslation("spell.resist", target.getName(), + this.getNameForTranslationFormatted()), true); }else{ WizardryUtilities.attackEntityWithoutKnockback(target, MagicDamage.causeDirectMagicDamage(caster, DamageType.SHOCK), damage); diff --git a/src/main/java/electroblob/wizardry/spell/MindControl.java b/src/main/java/electroblob/wizardry/spell/MindControl.java index 0c10155b..a472cf92 100644 --- a/src/main/java/electroblob/wizardry/spell/MindControl.java +++ b/src/main/java/electroblob/wizardry/spell/MindControl.java @@ -54,8 +54,8 @@ public class MindControl extends SpellRay { if(!canControl(target)){ // Adds a message saying that the player/boss entity/wizard resisted mind control - caster.sendMessage(new TextComponentTranslation("spell.resist", target.getName(), - this.getNameForTranslationFormatted())); + ((EntityPlayer)caster).sendStatusMessage(new TextComponentTranslation("spell.resist", target.getName(), + this.getNameForTranslationFormatted()), true); }else if(target instanceof EntityLiving){ diff --git a/src/main/java/electroblob/wizardry/spell/Poison.java b/src/main/java/electroblob/wizardry/spell/Poison.java index 057f0f2c..a08a5920 100644 --- a/src/main/java/electroblob/wizardry/spell/Poison.java +++ b/src/main/java/electroblob/wizardry/spell/Poison.java @@ -41,8 +41,8 @@ public class Poison extends SpellRay { // Has no effect on undead or spiders. if(MagicDamage.isEntityImmune(DamageType.POISON, target)){ - if(!world.isRemote) caster.sendMessage(new TextComponentTranslation("spell.resist", target.getName(), - this.getNameForTranslationFormatted())); + if(!world.isRemote && caster instanceof EntityPlayer) ((EntityPlayer)caster).sendStatusMessage( + new TextComponentTranslation("spell.resist", target.getName(), this.getNameForTranslationFormatted()), true); }else{ target.attackEntityFrom(MagicDamage.causeDirectMagicDamage(caster, DamageType.POISON), 1 * modifiers.get(SpellModifiers.POTENCY)); diff --git a/src/main/java/electroblob/wizardry/spell/Slime.java b/src/main/java/electroblob/wizardry/spell/Slime.java index b972686b..9b9e53fe 100644 --- a/src/main/java/electroblob/wizardry/spell/Slime.java +++ b/src/main/java/electroblob/wizardry/spell/Slime.java @@ -54,8 +54,8 @@ public class Slime extends SpellRay { if(WizardryUtilities.isLiving(target) && !(target instanceof EntityMagicSlime)){ if(target instanceof EntitySlime){ - if(!world.isRemote) caster.sendMessage(new TextComponentTranslation("spell.resist", target.getName(), - this.getNameForTranslationFormatted())); + if(!world.isRemote && caster instanceof EntityPlayer) ((EntityPlayer)caster).sendStatusMessage( + new TextComponentTranslation("spell.resist", target.getName(), this.getNameForTranslationFormatted()), true); }else{ if(target instanceof EntitySkeleton && caster instanceof EntityPlayer) diff --git a/src/main/java/electroblob/wizardry/spell/Transportation.java b/src/main/java/electroblob/wizardry/spell/Transportation.java index 2e91f4dd..cbb838d0 100644 --- a/src/main/java/electroblob/wizardry/spell/Transportation.java +++ b/src/main/java/electroblob/wizardry/spell/Transportation.java @@ -46,15 +46,15 @@ public class Transportation extends Spell { return true; }else{ if(!world.isRemote) - caster.sendMessage(new TextComponentTranslation("spell." + this.getUnlocalisedName() + ".missing")); + caster.sendStatusMessage(new TextComponentTranslation("spell." + this.getUnlocalisedName() + ".missing"), true); } }else{ if(!world.isRemote) - caster.sendMessage(new TextComponentTranslation("spell." + this.getUnlocalisedName() + ".undefined")); + caster.sendStatusMessage(new TextComponentTranslation("spell." + this.getUnlocalisedName() + ".undefined"), true); } }else{ if(!world.isRemote) - caster.sendMessage(new TextComponentTranslation("spell." + this.getUnlocalisedName() + ".wrongdimension")); + caster.sendStatusMessage(new TextComponentTranslation("spell." + this.getUnlocalisedName() + ".wrongdimension"), true); } } return false; diff --git a/src/main/java/electroblob/wizardry/spell/Wither.java b/src/main/java/electroblob/wizardry/spell/Wither.java index 54d260fb..9055c0c4 100644 --- a/src/main/java/electroblob/wizardry/spell/Wither.java +++ b/src/main/java/electroblob/wizardry/spell/Wither.java @@ -37,8 +37,8 @@ public class Wither extends SpellRay { // Has no effect on withers or wither skeletons. if(MagicDamage.isEntityImmune(DamageType.WITHER, target)){ - if(!world.isRemote) caster.sendMessage(new TextComponentTranslation("spell.resist", target.getName(), - this.getNameForTranslationFormatted())); + if(!world.isRemote && caster instanceof EntityPlayer) ((EntityPlayer)caster).sendStatusMessage( + new TextComponentTranslation("spell.resist", target.getName(), this.getNameForTranslationFormatted()), true); }else{ target.attackEntityFrom(MagicDamage.causeDirectMagicDamage(caster, DamageType.WITHER), BASE_DAMAGE * modifiers.get(SpellModifiers.POTENCY));