diff --git a/src/main/java/com/minelittlepony/unicopia/spell/SpellAwkward.java b/src/main/java/com/minelittlepony/unicopia/spell/SpellAwkward.java index e40432c1..bf6b7203 100644 --- a/src/main/java/com/minelittlepony/unicopia/spell/SpellAwkward.java +++ b/src/main/java/com/minelittlepony/unicopia/spell/SpellAwkward.java @@ -26,7 +26,7 @@ public class SpellAwkward extends AbstractSpell { @Override public int getTint() { - return 0x248712; + return 0xE1239C; } @Override diff --git a/src/main/java/com/minelittlepony/unicopia/spell/SpellCharge.java b/src/main/java/com/minelittlepony/unicopia/spell/SpellCharge.java index f9782a78..53aae2f1 100644 --- a/src/main/java/com/minelittlepony/unicopia/spell/SpellCharge.java +++ b/src/main/java/com/minelittlepony/unicopia/spell/SpellCharge.java @@ -37,7 +37,7 @@ public class SpellCharge extends AbstractSpell { @Override public int getTint() { - return 0x0000AA; + return 0x7272B7; } @Override @@ -70,7 +70,10 @@ public class SpellCharge extends AbstractSpell { protected EntitySpell getTarget(ICaster source) { if (targettedEntity == null && targettedEntityId != null) { - source.getWorld().getEntities(EntitySpell.class, e -> e.getUniqueID().equals(targettedEntityId)).stream().findFirst().ifPresent(this::setTarget); + source.getWorld().getEntities(EntitySpell.class, e -> e.getUniqueID().equals(targettedEntityId)) + .stream() + .findFirst() + .ifPresent(this::setTarget); } if (targettedEntity != null && targettedEntity.isDead) { @@ -89,9 +92,9 @@ public class SpellCharge extends AbstractSpell { BlockPos origin = source.getOrigin(); List list = source.getWorld().getEntitiesInAABBexcluding(source.getEntity(), - searchArea.offset(origin), this::canTargetEntity).stream().sorted((a, b) -> { - return (int)(a.getDistanceSq(origin) - b.getDistanceSq(origin)); - }).collect(Collectors.toList()); + searchArea.offset(origin), this::canTargetEntity).stream().sorted((a, b) -> + (int)(a.getDistanceSq(origin) - b.getDistanceSq(origin)) + ).collect(Collectors.toList()); if (list.size() > 0) { setTarget((EntitySpell)list.get(0)); diff --git a/src/main/java/com/minelittlepony/unicopia/spell/SpellFire.java b/src/main/java/com/minelittlepony/unicopia/spell/SpellFire.java index b3d3c9d0..7f289a8e 100644 --- a/src/main/java/com/minelittlepony/unicopia/spell/SpellFire.java +++ b/src/main/java/com/minelittlepony/unicopia/spell/SpellFire.java @@ -80,7 +80,7 @@ public class SpellFire extends AbstractSpell.RangedAreaSpell implements IUseActi @Override public int getTint() { - return 0xFF0000; + return 0xFF5D00; } @Override diff --git a/src/main/java/com/minelittlepony/unicopia/spell/SpellIce.java b/src/main/java/com/minelittlepony/unicopia/spell/SpellIce.java index 395d9c4c..fe5d0e63 100644 --- a/src/main/java/com/minelittlepony/unicopia/spell/SpellIce.java +++ b/src/main/java/com/minelittlepony/unicopia/spell/SpellIce.java @@ -68,7 +68,7 @@ public class SpellIce extends AbstractSpell.RangedAreaSpell implements IUseActio @Override public int getTint() { - return 0xADD8E6; + return 0xBDBDF9; } @Override diff --git a/src/main/java/com/minelittlepony/unicopia/spell/SpellInferno.java b/src/main/java/com/minelittlepony/unicopia/spell/SpellInferno.java index 67012a51..f4a6bb75 100644 --- a/src/main/java/com/minelittlepony/unicopia/spell/SpellInferno.java +++ b/src/main/java/com/minelittlepony/unicopia/spell/SpellInferno.java @@ -58,7 +58,7 @@ public class SpellInferno extends SpellFire { @Override public int getTint() { - return 0xFF8C00; + return 0xF00F00; } @Override diff --git a/src/main/java/com/minelittlepony/unicopia/spell/SpellNecromancy.java b/src/main/java/com/minelittlepony/unicopia/spell/SpellNecromancy.java index b857be84..23eda4cc 100644 --- a/src/main/java/com/minelittlepony/unicopia/spell/SpellNecromancy.java +++ b/src/main/java/com/minelittlepony/unicopia/spell/SpellNecromancy.java @@ -40,7 +40,7 @@ public class SpellNecromancy extends AbstractSpell.RangedAreaSpell { @Override public int getTint() { - return 0; + return 0x3A3A3A; } @Override diff --git a/src/main/java/com/minelittlepony/unicopia/spell/SpellRegistry.java b/src/main/java/com/minelittlepony/unicopia/spell/SpellRegistry.java index 38b46a88..b79832f9 100644 --- a/src/main/java/com/minelittlepony/unicopia/spell/SpellRegistry.java +++ b/src/main/java/com/minelittlepony/unicopia/spell/SpellRegistry.java @@ -42,7 +42,8 @@ public class SpellRegistry { registerSpell(SpellAwkward::new); registerSpell(SpellInferno::new); registerSpell(SpellDrake::new); - registerSpell(GenericSpell.factory("light", 0xf0ff0f, SpellAffinity.GOOD)); + registerSpell(SpellReveal::new); + registerSpell(GenericSpell.factory("light", 0xF7FACB, SpellAffinity.GOOD)); } @Nullable diff --git a/src/main/java/com/minelittlepony/unicopia/spell/SpellVortex.java b/src/main/java/com/minelittlepony/unicopia/spell/SpellVortex.java index aa1f6d5a..d4fac4d5 100644 --- a/src/main/java/com/minelittlepony/unicopia/spell/SpellVortex.java +++ b/src/main/java/com/minelittlepony/unicopia/spell/SpellVortex.java @@ -17,6 +17,11 @@ public class SpellVortex extends SpellShield { return "vortex"; } + @Override + public int getTint() { + return 0x4CDEE7; + } + @Override public SpellAffinity getAffinity() { return SpellAffinity.NEUTRAL;