Rename FireballEntity to IgnitingProjectile and update hierarchy (#2550)

* Rename FireballEntity to IgnitingProjectile and update hierarchy * run spotlessApply
SpongePowered · Jul 3, 2024 · 4f37e65 · 4f37e65
1 parent 1993b88
commit 4f37e65
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 11 deletions.
diff --git a/src/main/java/org/spongepowered/api/data/Keys.java b/src/main/java/org/spongepowered/api/data/Keys.java
@@ -192,14 +192,14 @@
 import org.spongepowered.api.entity.projectile.DamagingProjectile;
 import org.spongepowered.api.entity.projectile.EyeOfEnder;
 import org.spongepowered.api.entity.projectile.FishingBobber;
+import org.spongepowered.api.entity.projectile.IgnitingProjectile;
 import org.spongepowered.api.entity.projectile.Potion;
 import org.spongepowered.api.entity.projectile.Projectile;
 import org.spongepowered.api.entity.projectile.ShulkerBullet;
 import org.spongepowered.api.entity.projectile.arrow.Arrow;
 import org.spongepowered.api.entity.projectile.arrow.ArrowEntity;
 import org.spongepowered.api.entity.projectile.explosive.FireworkRocket;
 import org.spongepowered.api.entity.projectile.explosive.WitherSkull;
-import org.spongepowered.api.entity.projectile.explosive.fireball.FireballEntity;
 import org.spongepowered.api.entity.vehicle.Boat;
 import org.spongepowered.api.entity.vehicle.minecart.BlockOccupiedMinecart;
 import org.spongepowered.api.entity.vehicle.minecart.CommandBlockMinecart;
@@ -615,7 +615,7 @@ public final class Keys {
     /**
      * Whether a {@link Living} entity may change blocks.
      * This mostly applies to {@link Enderman} or
-     * {@link Creeper}s, but also to some projectiles like {@link FireballEntity}s or {@link WitherSkull}.
+     * {@link Creeper}s, but also to some projectiles like {@link IgnitingProjectile}s or {@link WitherSkull}.
      */
     public static final Key<Value<Boolean>> CAN_GRIEF = Keys.key(ResourceKey.sponge("can_grief"), Boolean.class);
 

diff --git a/...le/explosive/fireball/FireballEntity.java → ...entity/projectile/IgnitingProjectile.java b/...le/explosive/fireball/FireballEntity.java → ...entity/projectile/IgnitingProjectile.java
@@ -22,13 +22,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.spongepowered.api.entity.projectile.explosive.fireball;
+package org.spongepowered.api.entity.projectile;
 
-import org.spongepowered.api.entity.projectile.DamagingProjectile;
+import org.spongepowered.api.entity.projectile.explosive.fireball.SmallFireball;
 
 /**
- * Represents an abstract fireball, such as {@link SmallFireball}.
+ * Represents an abstract projectile that may ignite, such as {@link SmallFireball}.
  */
-public interface FireballEntity extends DamagingProjectile {
+public interface IgnitingProjectile extends DamagingProjectile {
 
 }
diff --git a/src/main/java/org/spongepowered/api/entity/projectile/explosive/WitherSkull.java b/src/main/java/org/spongepowered/api/entity/projectile/explosive/WitherSkull.java
@@ -25,11 +25,11 @@
 package org.spongepowered.api.entity.projectile.explosive;
 
 import org.spongepowered.api.entity.explosive.Explosive;
-import org.spongepowered.api.entity.projectile.explosive.fireball.FireballEntity;
+import org.spongepowered.api.entity.projectile.DamagingProjectile;
 
 /**
  * Represents a Wither Skull.
  */
-public interface WitherSkull extends FireballEntity, Explosive {
+public interface WitherSkull extends DamagingProjectile, Explosive {
 
 }
diff --git a/src/main/java/org/spongepowered/api/entity/projectile/explosive/fireball/DragonFireball.java b/src/main/java/org/spongepowered/api/entity/projectile/explosive/fireball/DragonFireball.java
@@ -24,6 +24,8 @@
  */
 package org.spongepowered.api.entity.projectile.explosive.fireball;
 
-public interface DragonFireball extends FireballEntity {
+import org.spongepowered.api.entity.projectile.DamagingProjectile;
+
+public interface DragonFireball extends DamagingProjectile {
 
 }
diff --git a/...in/java/org/spongepowered/api/entity/projectile/explosive/fireball/ExplosiveFireball.java b/...in/java/org/spongepowered/api/entity/projectile/explosive/fireball/ExplosiveFireball.java
@@ -26,11 +26,12 @@
 
 import org.spongepowered.api.entity.explosive.Explosive;
 import org.spongepowered.api.entity.living.monster.Ghast;
+import org.spongepowered.api.entity.projectile.IgnitingProjectile;
 import org.spongepowered.api.entity.projectile.Projectile;
 
 /**
  * Represents an explosive fireball, such as {@link Projectile profectiles} launched by {@link Ghast ghasts}.
  */
-public interface ExplosiveFireball extends FireballEntity, Explosive {
+public interface ExplosiveFireball extends IgnitingProjectile, Explosive {
 
 }
diff --git a/src/main/java/org/spongepowered/api/entity/projectile/explosive/fireball/SmallFireball.java b/src/main/java/org/spongepowered/api/entity/projectile/explosive/fireball/SmallFireball.java
@@ -25,11 +25,12 @@
 package org.spongepowered.api.entity.projectile.explosive.fireball;
 
 import org.spongepowered.api.entity.living.monster.Blaze;
+import org.spongepowered.api.entity.projectile.IgnitingProjectile;
 import org.spongepowered.api.entity.projectile.Projectile;
 
 /**
  * Represents a smaller fireball, such as {@link Projectile profectiles} launched by {@link Blaze blazes}.
  */
-public interface SmallFireball extends FireballEntity {
+public interface SmallFireball extends IgnitingProjectile {
 
 }