Use Aerial to abstract flying trait (#2540)

* Use Aerial to abstract flying trait

* Update Phantom.java

Author: ImMorpheus

…ngepowered/api/entity/living/Aerial.java …org/spongepowered/api/entity/Aerial.javasrc/main/java/org/spongepowered/api/entity/living/Aerial.java renamed to src/main/java/org/spongepowered/api/entity/Aerial.java src/main/java/org/spongepowered/api/entity/living/Aerial.java renamed to src/main/java/org/spongepowered/api/entity/Aerial.java

@@ -22,11 +22,22 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.spongepowered.api.entity.living;
+package org.spongepowered.api.entity;
+
+import org.spongepowered.api.data.Keys;
+import org.spongepowered.api.data.value.Value;
 
 /**
- * Represents an entity that flies, such as a bat.
+ * Represents an {@link Entity} which can fly.
  */
-public interface Aerial extends Agent {
+public interface Aerial extends Entity {
 
+    /**
+     * {@link Keys#IS_FLYING}
+     *
+     * @return Whether the entity is flying
+     */
+    default Value.Mutable<Boolean> flying() {
+        return this.requireValue(Keys.IS_FLYING).asMutable();
+    }
 }

src/main/java/org/spongepowered/api/entity/living/Bat.java

@@ -26,6 +26,7 @@
 
 import org.spongepowered.api.data.Keys;
 import org.spongepowered.api.data.value.Value;
+import org.spongepowered.api.entity.Aerial;
 
 /**
  * Represents a Bat.

src/main/java/org/spongepowered/api/entity/living/animal/Bee.java

@@ -24,8 +24,10 @@
  */
 package org.spongepowered.api.entity.living.animal;
 
+import org.spongepowered.api.entity.Aerial;
+
 /**
  * Represents a Bee.
  */
-public interface Bee extends Animal {
+public interface Bee extends Animal, Aerial {
 }

src/main/java/org/spongepowered/api/entity/living/animal/Parrot.java

@@ -27,11 +27,12 @@
 import org.spongepowered.api.data.Keys;
 import org.spongepowered.api.data.type.ParrotType;
 import org.spongepowered.api.data.value.Value;
+import org.spongepowered.api.entity.Aerial;
 
 /**
  * Represents a Parrot.
  */
-public interface Parrot extends TameableAnimal {
+public interface Parrot extends TameableAnimal, Aerial {
 
     /**
      * {@link Keys#PARROT_TYPE}

src/main/java/org/spongepowered/api/entity/living/monster/Blaze.java

@@ -26,7 +26,7 @@
 
 import org.spongepowered.api.data.Keys;
 import org.spongepowered.api.data.value.Value;
-import org.spongepowered.api.entity.living.Aerial;
+import org.spongepowered.api.entity.Aerial;
 import org.spongepowered.api.entity.living.Monster;
 import org.spongepowered.api.entity.living.Ranger;
 

src/main/java/org/spongepowered/api/entity/living/monster/Ghast.java

@@ -24,7 +24,7 @@
  */
 package org.spongepowered.api.entity.living.monster;
 
-import org.spongepowered.api.entity.living.Aerial;
+import org.spongepowered.api.entity.Aerial;
 import org.spongepowered.api.entity.living.Hostile;
 import org.spongepowered.api.entity.living.Ranger;
 

src/main/java/org/spongepowered/api/entity/living/monster/Phantom.java

@@ -27,7 +27,7 @@
 import org.spongepowered.api.data.Keys;
 import org.spongepowered.api.data.type.PhantomPhase;
 import org.spongepowered.api.data.value.Value;
-import org.spongepowered.api.entity.living.Aerial;
+import org.spongepowered.api.entity.Aerial;
 import org.spongepowered.api.entity.living.Agent;
 
 public interface Phantom extends Agent, Aerial {

src/main/java/org/spongepowered/api/entity/living/monster/boss/Wither.java

@@ -26,9 +26,9 @@
 
 import org.spongepowered.api.data.Keys;
 import org.spongepowered.api.data.value.ListValue;
+import org.spongepowered.api.entity.Aerial;
 import org.spongepowered.api.entity.Entity;
 import org.spongepowered.api.entity.explosive.fused.FusedExplosive;
-import org.spongepowered.api.entity.living.Aerial;
 import org.spongepowered.api.entity.living.Monster;
 import org.spongepowered.api.entity.living.Ranger;
 

src/main/java/org/spongepowered/api/entity/living/monster/boss/dragon/EnderDragon.java

@@ -26,8 +26,8 @@
 
 import org.spongepowered.api.data.Keys;
 import org.spongepowered.api.data.value.Value;
+import org.spongepowered.api.entity.Aerial;
 import org.spongepowered.api.entity.explosive.EndCrystal;
-import org.spongepowered.api.entity.living.Aerial;
 import org.spongepowered.api.entity.living.ComplexLiving;
 import org.spongepowered.api.entity.living.Monster;
 import org.spongepowered.api.entity.living.Ranger;

src/main/java/org/spongepowered/api/entity/living/player/Player.java

@@ -30,6 +30,7 @@
 import org.spongepowered.api.data.type.HandPreference;
 import org.spongepowered.api.data.value.Value;
 import org.spongepowered.api.effect.Viewer;
+import org.spongepowered.api.entity.Aerial;
 import org.spongepowered.api.entity.living.Humanoid;
 import org.spongepowered.api.item.inventory.Carrier;
 import org.spongepowered.api.item.inventory.Inventory;
@@ -40,7 +41,7 @@
 /**
  * A Player is the representation of an actual unit playing the game.
  */
-public interface Player extends Humanoid, Identified, LocaleSource, Viewer, Carrier {
+public interface Player extends Humanoid, Identified, LocaleSource, Viewer, Carrier, Aerial {
 
     /**
      * Gets the associated {@link GameProfile} of this player.
@@ -155,15 +156,6 @@ default Value.Mutable<Integer> foodLevel() {
         return this.requireValue(Keys.FOOD_LEVEL).asMutable();
     }
 
-    /**
-     * {@link Keys#IS_FLYING}
-     *
-     * @return Whether the entity is flying
-     */
-    default Value.Mutable<Boolean> flying() {
-        return this.requireValue(Keys.IS_FLYING).asMutable();
-    }
-
     /**
      * {@link Keys#IS_SLEEPING}
      *