Races now have an affinity

src/main/java/com/minelittlepony/unicopia/Affinity.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.unicopia.ability.magic;
+package com.minelittlepony.unicopia;
 
 import net.minecraft.text.Text;
 import net.minecraft.text.TranslatableText;
@@ -40,6 +40,10 @@ public enum Affinity {
         return this == NEUTRAL;
     }
 
+    public boolean alignsWith(Affinity other) {
+        return isNeutral() || other.isNeutral() || this == other;
+    }
+
     public Affinity[] getImplicators() {
         if (implications != null) {
             return implications;

src/main/java/com/minelittlepony/unicopia/Race.java

@@ -7,10 +7,11 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import com.google.common.base.Strings;
+import com.minelittlepony.unicopia.ability.magic.Affine;
 
 import net.minecraft.entity.player.PlayerEntity;
 
-public enum Race {
+public enum Race implements Affine {
     /**
      * The default, unset race.
      * This is used if there are no other races.
@@ -35,6 +36,11 @@ public enum Race {
         this.earth = earth;
     }
 
+    @Override
+    public Affinity getAffinity() {
+        return this == CHANGELING ? Affinity.BAD : Affinity.NEUTRAL;
+    }
+
     public boolean hasIronGut() {
         return isUsable() && this != CHANGELING;
     }
@@ -71,7 +77,6 @@ public enum Race {
         return String.format("unicopia.race.%s", name().toLowerCase());
     }
 
-
     public boolean isPermitted(PlayerEntity sender) {
         if (isOp() && (sender == null || !sender.abilities.creativeMode)) {
             return false;

src/main/java/com/minelittlepony/unicopia/ability/magic/Affine.java

@@ -1,5 +1,7 @@
 package com.minelittlepony.unicopia.ability.magic;
 
+import com.minelittlepony.unicopia.Affinity;
+
 /**
  * Interface for things that have an affine alignment.
  */
@@ -9,4 +11,9 @@ public interface Affine {
      * Good/Bad/Neutral
      */
     Affinity getAffinity();
+
+
+    default boolean isEnemy(Affine other) {
+        return !getAffinity().alignsWith(other.getAffinity());
+    }
 }

src/main/java/com/minelittlepony/unicopia/ability/magic/ThrowableSpell.java

@@ -2,6 +2,7 @@ package com.minelittlepony.unicopia.ability.magic;
 
 import javax.annotation.Nullable;
 
+import com.minelittlepony.unicopia.Affinity;
 import com.minelittlepony.unicopia.UEntities;
 import com.minelittlepony.unicopia.ability.magic.spell.SpellRegistry;
 import com.minelittlepony.unicopia.projectile.MagicProjectileEntity;

src/main/java/com/minelittlepony/unicopia/ability/magic/spell/AttractiveSpell.java

@@ -5,7 +5,7 @@ import java.util.stream.Collectors;
 
 import javax.annotation.Nullable;
 
-import com.minelittlepony.unicopia.ability.magic.Affinity;
+import com.minelittlepony.unicopia.Affinity;
 import com.minelittlepony.unicopia.ability.magic.Caster;
 import com.minelittlepony.unicopia.entity.player.Pony;
 import com.minelittlepony.unicopia.particle.MagicParticleEffect;

src/main/java/com/minelittlepony/unicopia/ability/magic/spell/AwkwardSpell.java

@@ -3,7 +3,7 @@ package com.minelittlepony.unicopia.ability.magic.spell;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.minelittlepony.unicopia.ability.magic.Affinity;
+import com.minelittlepony.unicopia.Affinity;
 import com.minelittlepony.unicopia.ability.magic.Caster;
 import com.minelittlepony.unicopia.ability.magic.ThrowableSpell;
 import com.minelittlepony.unicopia.util.shape.Sphere;

src/main/java/com/minelittlepony/unicopia/ability/magic/spell/DisguiseSpell.java

@@ -5,12 +5,12 @@ import java.util.UUID;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import com.minelittlepony.unicopia.Affinity;
 import com.minelittlepony.unicopia.InteractionManager;
 import com.minelittlepony.unicopia.Owned;
 import com.minelittlepony.unicopia.Race;
 import com.minelittlepony.unicopia.ability.FlightPredicate;
 import com.minelittlepony.unicopia.ability.HeightPredicate;
-import com.minelittlepony.unicopia.ability.magic.Affinity;
 import com.minelittlepony.unicopia.ability.magic.AttachableSpell;
 import com.minelittlepony.unicopia.ability.magic.Caster;
 import com.minelittlepony.unicopia.ability.magic.CasterUtils;

src/main/java/com/minelittlepony/unicopia/ability/magic/spell/FireSpell.java

@@ -1,7 +1,7 @@
 package com.minelittlepony.unicopia.ability.magic.spell;
 
+import com.minelittlepony.unicopia.Affinity;
 import com.minelittlepony.unicopia.EquinePredicates;
-import com.minelittlepony.unicopia.ability.magic.Affinity;
 import com.minelittlepony.unicopia.ability.magic.Caster;
 import com.minelittlepony.unicopia.ability.magic.Magical;
 import com.minelittlepony.unicopia.block.state.StateMaps;

src/main/java/com/minelittlepony/unicopia/ability/magic/spell/GenericSpell.java

@@ -2,7 +2,7 @@ package com.minelittlepony.unicopia.ability.magic.spell;
 
 import java.util.function.Supplier;
 
-import com.minelittlepony.unicopia.ability.magic.Affinity;
+import com.minelittlepony.unicopia.Affinity;
 import com.minelittlepony.unicopia.ability.magic.Caster;
 import com.minelittlepony.unicopia.ability.magic.Spell;
 import com.minelittlepony.unicopia.particle.MagicParticleEffect;

src/main/java/com/minelittlepony/unicopia/ability/magic/spell/IceSpell.java

@@ -1,6 +1,6 @@
 package com.minelittlepony.unicopia.ability.magic.spell;
 
-import com.minelittlepony.unicopia.ability.magic.Affinity;
+import com.minelittlepony.unicopia.Affinity;
 import com.minelittlepony.unicopia.ability.magic.Caster;
 import com.minelittlepony.unicopia.block.state.StateMaps;
 import com.minelittlepony.unicopia.util.MagicalDamageSource;

src/main/java/com/minelittlepony/unicopia/ability/magic/spell/InfernoSpell.java

@@ -1,6 +1,6 @@
 package com.minelittlepony.unicopia.ability.magic.spell;
 
-import com.minelittlepony.unicopia.ability.magic.Affinity;
+import com.minelittlepony.unicopia.Affinity;
 import com.minelittlepony.unicopia.ability.magic.Caster;
 import com.minelittlepony.unicopia.block.state.StateMaps;
 import com.minelittlepony.unicopia.util.MagicalDamageSource;

src/main/java/com/minelittlepony/unicopia/ability/magic/spell/NecromancySpell.java

@@ -3,7 +3,7 @@ package com.minelittlepony.unicopia.ability.magic.spell;
 import java.util.List;
 
 import com.google.common.collect.Lists;
-import com.minelittlepony.unicopia.ability.magic.Affinity;
+import com.minelittlepony.unicopia.Affinity;
 import com.minelittlepony.unicopia.ability.magic.Caster;
 import com.minelittlepony.unicopia.util.VecHelper;
 import com.minelittlepony.unicopia.util.WorldEvent;

src/main/java/com/minelittlepony/unicopia/ability/magic/spell/RevealingSpell.java

@@ -1,6 +1,6 @@
 package com.minelittlepony.unicopia.ability.magic.spell;
 
-import com.minelittlepony.unicopia.ability.magic.Affinity;
+import com.minelittlepony.unicopia.Affinity;
 import com.minelittlepony.unicopia.ability.magic.Caster;
 import com.minelittlepony.unicopia.ability.magic.Suppressable;
 import com.minelittlepony.unicopia.particle.MagicParticleEffect;

src/main/java/com/minelittlepony/unicopia/ability/magic/spell/ScorchSpell.java

@@ -2,7 +2,7 @@ package com.minelittlepony.unicopia.ability.magic.spell;
 
 import javax.annotation.Nullable;
 
-import com.minelittlepony.unicopia.ability.magic.Affinity;
+import com.minelittlepony.unicopia.Affinity;
 import com.minelittlepony.unicopia.ability.magic.Caster;
 import com.minelittlepony.unicopia.ability.magic.ThrowableSpell;
 import com.minelittlepony.unicopia.block.state.StateMaps;

src/main/java/com/minelittlepony/unicopia/ability/magic/spell/ShieldSpell.java

@@ -3,8 +3,8 @@ package com.minelittlepony.unicopia.ability.magic.spell;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.minelittlepony.unicopia.Affinity;
 import com.minelittlepony.unicopia.EquinePredicates;
-import com.minelittlepony.unicopia.ability.magic.Affinity;
 import com.minelittlepony.unicopia.ability.magic.AttachableSpell;
 import com.minelittlepony.unicopia.ability.magic.Caster;
 import com.minelittlepony.unicopia.entity.player.Pony;

src/main/java/com/minelittlepony/unicopia/ability/magic/spell/SiphoningSpell.java

@@ -3,8 +3,8 @@ package com.minelittlepony.unicopia.ability.magic.spell;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.minelittlepony.unicopia.Affinity;
 import com.minelittlepony.unicopia.Race;
-import com.minelittlepony.unicopia.ability.magic.Affinity;
 import com.minelittlepony.unicopia.ability.magic.Caster;
 import com.minelittlepony.unicopia.entity.player.Pony;
 import com.minelittlepony.unicopia.util.MagicalDamageSource;

src/main/java/com/minelittlepony/unicopia/ability/magic/spell/SpellRegistry.java

@@ -10,7 +10,7 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
-import com.minelittlepony.unicopia.ability.magic.Affinity;
+import com.minelittlepony.unicopia.Affinity;
 import com.minelittlepony.unicopia.ability.magic.Spell;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundTag;

src/main/java/com/minelittlepony/unicopia/client/gui/SettingsScreen.java

@@ -18,7 +18,7 @@ public class SettingsScreen extends GameGui {
         addButton(new Label(width / 2, 15))
             .getStyle()
                 .setColor(16777215)
-                .setText(title.asString());
+                .setText(title);
         addButton(new Button(width / 2 - 100, height / 6 + 168))
             .onClick(s -> finish())
             .getStyle().setText("gui.done");

src/main/java/com/minelittlepony/unicopia/entity/Creature.java

@@ -1,8 +1,8 @@
 package com.minelittlepony.unicopia.entity;
 
+import com.minelittlepony.unicopia.Affinity;
 import com.minelittlepony.unicopia.Race;
 import com.minelittlepony.unicopia.ability.magic.Affine;
-import com.minelittlepony.unicopia.ability.magic.Affinity;
 import com.minelittlepony.unicopia.ability.magic.AttachableSpell;
 import com.minelittlepony.unicopia.ability.magic.Caster;
 import com.minelittlepony.unicopia.ability.magic.Spell;

src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java

@@ -2,10 +2,10 @@ package com.minelittlepony.unicopia.entity.player;
 
 import javax.annotation.Nullable;
 
+import com.minelittlepony.unicopia.Affinity;
 import com.minelittlepony.unicopia.InteractionManager;
 import com.minelittlepony.unicopia.Race;
 import com.minelittlepony.unicopia.ability.AbilityDispatcher;
-import com.minelittlepony.unicopia.ability.magic.Affinity;
 import com.minelittlepony.unicopia.ability.magic.AttachableSpell;
 import com.minelittlepony.unicopia.ability.magic.Caster;
 import com.minelittlepony.unicopia.ability.magic.Spell;

src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java

@@ -2,7 +2,7 @@ package com.minelittlepony.unicopia.projectile;
 
 import java.util.UUID;
 
-import com.minelittlepony.unicopia.ability.magic.Affinity;
+import com.minelittlepony.unicopia.Affinity;
 import com.minelittlepony.unicopia.ability.magic.Caster;
 import com.minelittlepony.unicopia.ability.magic.Magical;
 import com.minelittlepony.unicopia.ability.magic.Spell;