Add ItemSupplier and remove ThrowableProjectile

src/main/java/org/spongepowered/api/entity/projectile/EyeOfEnder.java

@@ -32,7 +32,7 @@
 /**
  * Represents an Eye of Ender.
  */
-public interface EyeOfEnder extends Projectile {
+public interface EyeOfEnder extends Projectile, ItemSupplier {
 
     /**
      * {@link Keys#DESPAWN_DELAY}

src/main/java/org/spongepowered/api/entity/projectile/IgnitingProjectile.java

@@ -29,6 +29,6 @@
 /**
  * Represents an abstract projectile that may ignite, such as {@link SmallFireball}.
  */
-public interface IgnitingProjectile extends DamagingProjectile {
+public interface IgnitingProjectile extends DamagingProjectile, ItemSupplier {
 
 }

src/main/java/org/spongepowered/api/entity/projectile/ThrowableProjectile.java → src/main/java/org/spongepowered/api/entity/projectile/ItemSupplier.java

@@ -24,5 +24,19 @@
  */
 package org.spongepowered.api.entity.projectile;
 
-public interface ThrowableProjectile extends Projectile {
+import org.spongepowered.api.data.Keys;
+import org.spongepowered.api.data.value.Value;
+import org.spongepowered.api.entity.Entity;
+import org.spongepowered.api.item.inventory.ItemStackSnapshot;
+
+public interface ItemSupplier extends Entity {
+
+    /**
+     * {@link Keys#ITEM_STACK_SNAPSHOT}
+     *
+     * @return The potion item represented by this potion
+     */
+    default Value.Mutable<ItemStackSnapshot> item() {
+        return this.requireValue(Keys.ITEM_STACK_SNAPSHOT).asMutable();
+    }
 }

src/main/java/org/spongepowered/api/entity/projectile/Potion.java

@@ -26,24 +26,13 @@
 
 import org.spongepowered.api.data.Keys;
 import org.spongepowered.api.data.value.ListValue;
-import org.spongepowered.api.data.value.Value;
 import org.spongepowered.api.effect.potion.PotionEffect;
-import org.spongepowered.api.item.inventory.ItemStackSnapshot;
 
 /**
  * Represents a thrown potion.
  */
 public interface Potion extends ThrowableItemProjectile {
 
-    /**
-     * {@link Keys#ITEM_STACK_SNAPSHOT}
-     *
-     * @return The potion item represented by this potion
-     */
-    default Value.Mutable<ItemStackSnapshot> item() {
-        return this.requireValue(Keys.ITEM_STACK_SNAPSHOT).asMutable();
-    }
-
     /**
      * {@link Keys#POTION_EFFECTS}
      *

src/main/java/org/spongepowered/api/entity/projectile/ThrowableItemProjectile.java

@@ -24,5 +24,5 @@
  */
 package org.spongepowered.api.entity.projectile;
 
-public interface ThrowableItemProjectile extends ThrowableProjectile {
+public interface ThrowableItemProjectile extends Projectile, ItemSupplier {
 }

src/main/java/org/spongepowered/api/entity/projectile/explosive/FireworkRocket.java

@@ -28,6 +28,7 @@
 import org.spongepowered.api.data.value.ListValue;
 import org.spongepowered.api.data.value.Value;
 import org.spongepowered.api.entity.explosive.fused.FusedExplosive;
+import org.spongepowered.api.entity.projectile.ItemSupplier;
 import org.spongepowered.api.entity.projectile.Projectile;
 import org.spongepowered.api.item.FireworkEffect;
 import org.spongepowered.api.util.Ticks;
@@ -37,7 +38,7 @@
 /**
  * Represents a Firework.
  */
-public interface FireworkRocket extends Projectile, FusedExplosive {
+public interface FireworkRocket extends Projectile, FusedExplosive, ItemSupplier {
 
     /**
      * {@link Keys#FIREWORK_EFFECTS}

src/main/java/org/spongepowered/api/entity/projectile/windcharge/WindChargeLike.java

@@ -25,6 +25,7 @@
 package org.spongepowered.api.entity.projectile.windcharge;
 
 import org.spongepowered.api.entity.projectile.DamagingProjectile;
+import org.spongepowered.api.entity.projectile.ItemSupplier;
 
-public interface WindChargeLike extends DamagingProjectile {
+public interface WindChargeLike extends DamagingProjectile, ItemSupplier {
 }