Some minor restructuring

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

@@ -1,5 +1,7 @@
 package com.minelittlepony.unicopia;
 
+import com.minelittlepony.unicopia.entity.player.Pony;
+
 public enum FlightType {
     NONE,
     CREATIVE,
@@ -21,4 +23,13 @@ public enum FlightType {
     public boolean canFlySurvival() {
         return canFly() && !canFlyCreative();
     }
+
+    /**
+     * Predicate for abilities to control whether a player can fly.
+     *
+     * This overrides what the race specifies.
+     */
+    public interface Provider {
+        FlightType getFlightType(Pony player);
+    }
 }

src/main/java/com/minelittlepony/unicopia/ability/DimensionsPredicate.java

@@ -1,18 +0,0 @@
-package com.minelittlepony.unicopia.ability;
-
-import java.util.Optional;
-
-import com.minelittlepony.unicopia.entity.player.Pony;
-
-import net.minecraft.entity.EntityDimensions;
-
-/**
- * Predicate for abilities to control what the player's physical height is.
- *
- * This overrides the default.
- */
-public interface DimensionsPredicate {
-    float getTargetEyeHeight(Pony player);
-
-    Optional<EntityDimensions> getTargetDimensions(Pony player);
-}

src/main/java/com/minelittlepony/unicopia/ability/FlightPredicate.java

@@ -1,13 +0,0 @@
-package com.minelittlepony.unicopia.ability;
-
-import com.minelittlepony.unicopia.FlightType;
-import com.minelittlepony.unicopia.entity.player.Pony;
-
-/**
- * Predicate for abilities to control whether a player can fly.
- *
- * This overrides what the race specifies.
- */
-public interface FlightPredicate {
-    FlightType getFlightType(Pony player);
-}

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

@@ -5,7 +5,7 @@ package com.minelittlepony.unicopia.ability.magic;
  */
 public interface Attached extends Spell {
     /**
-     * Called every tick when attached to a player.
+     * Called every tick when attached to a living entity.
      *
      * @param source    The entity we are currently attached to.
      * @return true to keep alive
@@ -13,7 +13,8 @@ public interface Attached extends Spell {
     boolean updateOnPerson(Caster<?> caster);
 
     /**
-     * Called every tick when attached to a player. Used to apply particle effects.
+     * Called every tick when attached to a living entity.
+     * Used to apply particle effects.
      * Is only called on the client side.
      *
      * @param source    The entity we are currently attached to.

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

@@ -7,8 +7,6 @@ import javax.annotation.Nullable;
 import com.minelittlepony.unicopia.Affinity;
 import com.minelittlepony.unicopia.FlightType;
 import com.minelittlepony.unicopia.Owned;
-import com.minelittlepony.unicopia.ability.FlightPredicate;
-import com.minelittlepony.unicopia.ability.DimensionsPredicate;
 import com.minelittlepony.unicopia.ability.magic.Attached;
 import com.minelittlepony.unicopia.ability.magic.Caster;
 import com.minelittlepony.unicopia.ability.magic.Spell;
@@ -16,6 +14,7 @@ import com.minelittlepony.unicopia.ability.magic.Suppressable;
 import com.minelittlepony.unicopia.entity.behaviour.EntityBehaviour;
 import com.minelittlepony.unicopia.entity.behaviour.Disguise;
 import com.minelittlepony.unicopia.entity.player.Pony;
+import com.minelittlepony.unicopia.entity.player.PlayerDimensions;
 import com.minelittlepony.unicopia.particle.MagicParticleEffect;
 import com.minelittlepony.unicopia.particle.UParticles;
 import net.minecraft.entity.Entity;
@@ -27,7 +26,7 @@ import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.projectile.ProjectileEntity;
 import net.minecraft.nbt.CompoundTag;
 
-public class DisguiseSpell extends AbstractSpell implements Attached, Suppressable, FlightPredicate, DimensionsPredicate {
+public class DisguiseSpell extends AbstractSpell implements Attached, Suppressable, FlightType.Provider, PlayerDimensions.Provider {
 
     private final Disguise disguise = new Disguise();
 

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

@@ -4,7 +4,6 @@ import java.util.Optional;
 
 import javax.annotation.Nullable;
 
-import com.minelittlepony.unicopia.ability.DimensionsPredicate;
 import com.minelittlepony.unicopia.ability.magic.Spell;
 
 import net.minecraft.entity.EntityDimensions;
@@ -64,13 +63,19 @@ public final class PlayerDimensions {
         return defaultEyeHeight;
     }
 
-    Optional<DimensionsPredicate> getPredicate() {
+    Optional<Provider> getPredicate() {
         if (pony.hasSpell()) {
             Spell effect = pony.getSpell(true);
-            if (!effect.isDead() && effect instanceof DimensionsPredicate) {
+            if (!effect.isDead() && effect instanceof Provider) {
-                return Optional.of(((DimensionsPredicate)effect));
+                return Optional.of(((Provider)effect));
             }
         }
         return Optional.empty();
     }
+
+    public interface Provider {
+        float getTargetEyeHeight(Pony player);
+
+        Optional<EntityDimensions> getTargetDimensions(Pony player);
+    }
 }

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

@@ -3,7 +3,6 @@ package com.minelittlepony.unicopia.entity.player;
 import com.minelittlepony.unicopia.FlightType;
 import com.minelittlepony.unicopia.Race;
 import com.minelittlepony.unicopia.USounds;
-import com.minelittlepony.unicopia.ability.FlightPredicate;
 import com.minelittlepony.unicopia.ability.magic.Spell;
 import com.minelittlepony.unicopia.entity.EntityPhysics;
 import com.minelittlepony.unicopia.entity.player.MagicReserves.Bar;
@@ -302,8 +301,8 @@ public class PlayerPhysics extends EntityPhysics<Pony> implements Tickable, Moti
 
         if (pony.hasSpell()) {
             Spell effect = pony.getSpell(true);
-            if (!effect.isDead() && effect instanceof FlightPredicate) {
+            if (!effect.isDead() && effect instanceof FlightType.Provider) {
-                return ((FlightPredicate)effect).getFlightType(pony);
+                return ((FlightType.Provider)effect).getFlightType(pony);
             }
         }
 
@@ -343,4 +342,5 @@ public class PlayerPhysics extends EntityPhysics<Pony> implements Tickable, Moti
 
         pony.getMaster().calculateDimensions();
     }
+
 }