Update slime parent interface (#2539)

* Update slime parent interface * Update Slime.java
SpongePowered · Jun 30, 2024 · 0450e3a · 0450e3a
1 parent c868905
commit 0450e3a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git 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
@@ -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/...ntity/living/monster/slime/MagmaCube.java → ...ed/api/entity/living/slime/MagmaCube.java b/...ntity/living/monster/slime/MagmaCube.java → ...ed/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/...pi/entity/living/monster/slime/Slime.java → ...owered/api/entity/living/slime/Slime.java b/...pi/entity/living/monster/slime/Slime.java → ...owered/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/...ty/living/monster/slime/package-info.java → ...api/entity/living/slime/package-info.java b/...ty/living/monster/slime/package-info.java → ...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;