From 0450e3a1d78ccca15b4336f915a80a64ccf6500e Mon Sep 17 00:00:00 2001 From: Morpheus Date: Sun, 30 Jun 2024 11:52:42 +0000 Subject: [PATCH] Update slime parent interface (#2539) * Update slime parent interface * Update Slime.java --- src/main/java/org/spongepowered/api/data/Keys.java | 2 +- .../java/org/spongepowered/api/entity/EntityTypes.java | 4 ++-- .../api/entity/living/{monster => }/slime/MagmaCube.java | 2 +- .../api/entity/living/{monster => }/slime/Slime.java | 7 ++++--- .../entity/living/{monster => }/slime/package-info.java | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) rename src/main/java/org/spongepowered/api/entity/living/{monster => }/slime/MagmaCube.java (95%) rename src/main/java/org/spongepowered/api/entity/living/{monster => }/slime/Slime.java (88%) rename src/main/java/org/spongepowered/api/entity/living/{monster => }/slime/package-info.java (95%) diff --git a/src/main/java/org/spongepowered/api/data/Keys.java b/src/main/java/org/spongepowered/api/data/Keys.java index c5e79e4c673..cac1ec4acf1 100644 --- a/src/main/java/org/spongepowered/api/data/Keys.java +++ b/src/main/java/org/spongepowered/api/data/Keys.java @@ -179,7 +179,6 @@ import org.spongepowered.api.entity.living.monster.raider.illager.Vindicator; import org.spongepowered.api.entity.living.monster.raider.illager.spellcaster.Evoker; import org.spongepowered.api.entity.living.monster.raider.illager.spellcaster.Spellcaster; -import org.spongepowered.api.entity.living.monster.slime.Slime; import org.spongepowered.api.entity.living.monster.spider.Spider; import org.spongepowered.api.entity.living.monster.zombie.ZombieVillager; import org.spongepowered.api.entity.living.monster.zombie.ZombifiedPiglin; @@ -188,6 +187,7 @@ import org.spongepowered.api.entity.living.player.chat.ChatVisibility; import org.spongepowered.api.entity.living.player.gamemode.GameMode; import org.spongepowered.api.entity.living.player.server.ServerPlayer; +import org.spongepowered.api.entity.living.slime.Slime; import org.spongepowered.api.entity.living.trader.Trader; import org.spongepowered.api.entity.living.trader.Villager; import org.spongepowered.api.entity.projectile.DamagingProjectile; diff --git a/src/main/java/org/spongepowered/api/entity/EntityTypes.java b/src/main/java/org/spongepowered/api/entity/EntityTypes.java index 008324aaab9..64863cb3dea 100644 --- a/src/main/java/org/spongepowered/api/entity/EntityTypes.java +++ b/src/main/java/org/spongepowered/api/entity/EntityTypes.java @@ -108,8 +108,6 @@ import org.spongepowered.api.entity.living.monster.skeleton.Skeleton; import org.spongepowered.api.entity.living.monster.skeleton.Stray; import org.spongepowered.api.entity.living.monster.skeleton.WitherSkeleton; -import org.spongepowered.api.entity.living.monster.slime.MagmaCube; -import org.spongepowered.api.entity.living.monster.slime.Slime; import org.spongepowered.api.entity.living.monster.spider.CaveSpider; import org.spongepowered.api.entity.living.monster.spider.Spider; import org.spongepowered.api.entity.living.monster.zombie.Drowned; @@ -118,6 +116,8 @@ import org.spongepowered.api.entity.living.monster.zombie.ZombieVillager; import org.spongepowered.api.entity.living.monster.zombie.ZombifiedPiglin; import org.spongepowered.api.entity.living.player.Player; +import org.spongepowered.api.entity.living.slime.MagmaCube; +import org.spongepowered.api.entity.living.slime.Slime; import org.spongepowered.api.entity.living.trader.Villager; import org.spongepowered.api.entity.living.trader.WanderingTrader; import org.spongepowered.api.entity.projectile.Egg; diff --git a/src/main/java/org/spongepowered/api/entity/living/monster/slime/MagmaCube.java b/src/main/java/org/spongepowered/api/entity/living/slime/MagmaCube.java similarity index 95% rename from src/main/java/org/spongepowered/api/entity/living/monster/slime/MagmaCube.java rename to src/main/java/org/spongepowered/api/entity/living/slime/MagmaCube.java index 7e72a7ad1bc..96737ee8772 100644 --- a/src/main/java/org/spongepowered/api/entity/living/monster/slime/MagmaCube.java +++ b/src/main/java/org/spongepowered/api/entity/living/slime/MagmaCube.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.api.entity.living.monster.slime; +package org.spongepowered.api.entity.living.slime; /** * Represents a Magma Cube. diff --git a/src/main/java/org/spongepowered/api/entity/living/monster/slime/Slime.java b/src/main/java/org/spongepowered/api/entity/living/slime/Slime.java similarity index 88% rename from src/main/java/org/spongepowered/api/entity/living/monster/slime/Slime.java rename to src/main/java/org/spongepowered/api/entity/living/slime/Slime.java index 919d75aaaa5..7a383fe13f9 100644 --- a/src/main/java/org/spongepowered/api/entity/living/monster/slime/Slime.java +++ b/src/main/java/org/spongepowered/api/entity/living/slime/Slime.java @@ -22,16 +22,17 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.api.entity.living.monster.slime; +package org.spongepowered.api.entity.living.slime; import org.spongepowered.api.data.Keys; import org.spongepowered.api.data.value.Value; -import org.spongepowered.api.entity.living.Monster; +import org.spongepowered.api.entity.living.Agent; +import org.spongepowered.api.entity.living.Hostile; /** * Represents a Slime. */ -public interface Slime extends Monster { +public interface Slime extends Agent, Hostile { /** * {@link Keys#SIZE} diff --git a/src/main/java/org/spongepowered/api/entity/living/monster/slime/package-info.java b/src/main/java/org/spongepowered/api/entity/living/slime/package-info.java similarity index 95% rename from src/main/java/org/spongepowered/api/entity/living/monster/slime/package-info.java rename to src/main/java/org/spongepowered/api/entity/living/slime/package-info.java index c45e9fb20f7..e2914b0a5b7 100644 --- a/src/main/java/org/spongepowered/api/entity/living/monster/slime/package-info.java +++ b/src/main/java/org/spongepowered/api/entity/living/slime/package-info.java @@ -23,4 +23,4 @@ * THE SOFTWARE. */ @org.checkerframework.framework.qual.DefaultQualifier(org.checkerframework.checker.nullness.qual.NonNull.class) -package org.spongepowered.api.entity.living.monster.slime; +package org.spongepowered.api.entity.living.slime;