Skip to content

Commit 4f37e65

Browse files
authored
Rename FireballEntity to IgnitingProjectile and update hierarchy (#2550)
* Rename FireballEntity to IgnitingProjectile and update hierarchy * run spotlessApply
1 parent 1993b88 commit 4f37e65

File tree

6 files changed

+15
-11
lines changed

6 files changed

+15
-11
lines changed

src/main/java/org/spongepowered/api/data/Keys.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,14 +192,14 @@
192192
import org.spongepowered.api.entity.projectile.DamagingProjectile;
193193
import org.spongepowered.api.entity.projectile.EyeOfEnder;
194194
import org.spongepowered.api.entity.projectile.FishingBobber;
195+
import org.spongepowered.api.entity.projectile.IgnitingProjectile;
195196
import org.spongepowered.api.entity.projectile.Potion;
196197
import org.spongepowered.api.entity.projectile.Projectile;
197198
import org.spongepowered.api.entity.projectile.ShulkerBullet;
198199
import org.spongepowered.api.entity.projectile.arrow.Arrow;
199200
import org.spongepowered.api.entity.projectile.arrow.ArrowEntity;
200201
import org.spongepowered.api.entity.projectile.explosive.FireworkRocket;
201202
import org.spongepowered.api.entity.projectile.explosive.WitherSkull;
202-
import org.spongepowered.api.entity.projectile.explosive.fireball.FireballEntity;
203203
import org.spongepowered.api.entity.vehicle.Boat;
204204
import org.spongepowered.api.entity.vehicle.minecart.BlockOccupiedMinecart;
205205
import org.spongepowered.api.entity.vehicle.minecart.CommandBlockMinecart;
@@ -615,7 +615,7 @@ public final class Keys {
615615
/**
616616
* Whether a {@link Living} entity may change blocks.
617617
* This mostly applies to {@link Enderman} or
618-
* {@link Creeper}s, but also to some projectiles like {@link FireballEntity}s or {@link WitherSkull}.
618+
* {@link Creeper}s, but also to some projectiles like {@link IgnitingProjectile}s or {@link WitherSkull}.
619619
*/
620620
public static final Key<Value<Boolean>> CAN_GRIEF = Keys.key(ResourceKey.sponge("can_grief"), Boolean.class);
621621

src/main/java/org/spongepowered/api/entity/projectile/explosive/fireball/FireballEntity.java renamed to src/main/java/org/spongepowered/api/entity/projectile/IgnitingProjectile.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2323
* THE SOFTWARE.
2424
*/
25-
package org.spongepowered.api.entity.projectile.explosive.fireball;
25+
package org.spongepowered.api.entity.projectile;
2626

27-
import org.spongepowered.api.entity.projectile.DamagingProjectile;
27+
import org.spongepowered.api.entity.projectile.explosive.fireball.SmallFireball;
2828

2929
/**
30-
* Represents an abstract fireball, such as {@link SmallFireball}.
30+
* Represents an abstract projectile that may ignite, such as {@link SmallFireball}.
3131
*/
32-
public interface FireballEntity extends DamagingProjectile {
32+
public interface IgnitingProjectile extends DamagingProjectile {
3333

3434
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
package org.spongepowered.api.entity.projectile.explosive;
2626

2727
import org.spongepowered.api.entity.explosive.Explosive;
28-
import org.spongepowered.api.entity.projectile.explosive.fireball.FireballEntity;
28+
import org.spongepowered.api.entity.projectile.DamagingProjectile;
2929

3030
/**
3131
* Represents a Wither Skull.
3232
*/
33-
public interface WitherSkull extends FireballEntity, Explosive {
33+
public interface WitherSkull extends DamagingProjectile, Explosive {
3434

3535
}

src/main/java/org/spongepowered/api/entity/projectile/explosive/fireball/DragonFireball.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
*/
2525
package org.spongepowered.api.entity.projectile.explosive.fireball;
2626

27-
public interface DragonFireball extends FireballEntity {
27+
import org.spongepowered.api.entity.projectile.DamagingProjectile;
28+
29+
public interface DragonFireball extends DamagingProjectile {
2830

2931
}

src/main/java/org/spongepowered/api/entity/projectile/explosive/fireball/ExplosiveFireball.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,12 @@
2626

2727
import org.spongepowered.api.entity.explosive.Explosive;
2828
import org.spongepowered.api.entity.living.monster.Ghast;
29+
import org.spongepowered.api.entity.projectile.IgnitingProjectile;
2930
import org.spongepowered.api.entity.projectile.Projectile;
3031

3132
/**
3233
* Represents an explosive fireball, such as {@link Projectile profectiles} launched by {@link Ghast ghasts}.
3334
*/
34-
public interface ExplosiveFireball extends FireballEntity, Explosive {
35+
public interface ExplosiveFireball extends IgnitingProjectile, Explosive {
3536

3637
}

src/main/java/org/spongepowered/api/entity/projectile/explosive/fireball/SmallFireball.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,12 @@
2525
package org.spongepowered.api.entity.projectile.explosive.fireball;
2626

2727
import org.spongepowered.api.entity.living.monster.Blaze;
28+
import org.spongepowered.api.entity.projectile.IgnitingProjectile;
2829
import org.spongepowered.api.entity.projectile.Projectile;
2930

3031
/**
3132
* Represents a smaller fireball, such as {@link Projectile profectiles} launched by {@link Blaze blazes}.
3233
*/
33-
public interface SmallFireball extends FireballEntity {
34+
public interface SmallFireball extends IgnitingProjectile {
3435

3536
}

0 commit comments

Comments
 (0)