Bump SpongeAPI for entity changes

src/main/java/org/spongepowered/common/entity/ai/goal/builtin/creature/SpongeAttackLivingGoalBuilder.java

@@ -27,7 +27,7 @@
 import net.minecraft.world.entity.PathfinderMob;
 import net.minecraft.world.entity.ai.goal.MeleeAttackGoal;
 import org.spongepowered.api.entity.ai.goal.builtin.creature.AttackLivingGoal;
-import org.spongepowered.api.entity.living.Creature;
+import org.spongepowered.api.entity.living.PathfinderAgent;
 
 import java.util.Objects;
 
@@ -66,7 +66,7 @@ public AttackLivingGoal.Builder reset() {
     }
 
     @Override
-    public AttackLivingGoal build(Creature owner) {
+    public AttackLivingGoal build(PathfinderAgent owner) {
         Objects.requireNonNull(owner);
         return (AttackLivingGoal) new MeleeAttackGoal((PathfinderMob) owner, this.speed, this.longMemory);
     }

src/main/java/org/spongepowered/common/entity/ai/goal/builtin/creature/SpongeAvoidLivingGoalBuilder.java

@@ -27,8 +27,8 @@
 import net.minecraft.world.entity.PathfinderMob;
 import org.spongepowered.api.entity.Entity;
 import org.spongepowered.api.entity.ai.goal.builtin.creature.AvoidLivingGoal;
-import org.spongepowered.api.entity.living.Creature;
 import org.spongepowered.api.entity.living.Living;
+import org.spongepowered.api.entity.living.PathfinderAgent;
 
 import java.util.Objects;
 import java.util.function.Predicate;
@@ -86,7 +86,7 @@ public AvoidLivingGoal.Builder reset() {
 
     @Override
     @SuppressWarnings({"unchecked", "rawtypes"})
-    public AvoidLivingGoal build(Creature owner) {
+    public AvoidLivingGoal build(PathfinderAgent owner) {
         Objects.requireNonNull(owner);
         Objects.requireNonNull(this.targetSelector);
         return (AvoidLivingGoal) new net.minecraft.world.entity.ai.goal.AvoidEntityGoal((PathfinderMob) owner, Entity.class, this.searchDistance,

src/main/java/org/spongepowered/common/entity/ai/goal/builtin/creature/SpongeRandomWalkingGoalBuilder.java

@@ -26,7 +26,7 @@
 
 import net.minecraft.world.entity.PathfinderMob;
 import org.spongepowered.api.entity.ai.goal.builtin.creature.RandomWalkingGoal;
-import org.spongepowered.api.entity.living.Creature;
+import org.spongepowered.api.entity.living.PathfinderAgent;
 
 import java.util.Objects;
 
@@ -65,7 +65,7 @@ public RandomWalkingGoal.Builder reset() {
     }
 
     @Override
-    public RandomWalkingGoal build(Creature owner) {
+    public RandomWalkingGoal build(PathfinderAgent owner) {
         Objects.requireNonNull(owner);
         return (RandomWalkingGoal) new net.minecraft.world.entity.ai.goal.RandomStrollGoal((PathfinderMob) owner, this.speed, this.executionChance);
     }

src/main/java/org/spongepowered/common/entity/ai/goal/builtin/creature/SpongeRangedAttackAgainstAgentGoalBuilder.java

@@ -27,7 +27,7 @@
 import net.minecraft.world.entity.ai.goal.RangedAttackGoal;
 import net.minecraft.world.entity.monster.RangedAttackMob;
 import org.spongepowered.api.entity.ai.goal.builtin.creature.RangedAttackAgainstAgentGoal;
-import org.spongepowered.api.entity.living.Ranger;
+import org.spongepowered.api.entity.living.RangedAgent;
 import org.spongepowered.api.util.Ticks;
 import org.spongepowered.common.util.Constants;
 import org.spongepowered.common.util.SpongeTicks;
@@ -81,7 +81,7 @@ public RangedAttackAgainstAgentGoal.Builder reset() {
     }
 
     @Override
-    public RangedAttackAgainstAgentGoal build(final Ranger owner) {
+    public RangedAttackAgainstAgentGoal build(final RangedAgent owner) {
         Objects.requireNonNull(owner);
         if (!(owner instanceof RangedAttackMob)) {
             throw new IllegalArgumentException("Ranger must be an IRangedAttackMob!");

src/main/java/org/spongepowered/common/entity/ai/goal/builtin/creature/target/SpongeFindNearestAttackableTargetGoalBuilder.java

@@ -30,8 +30,8 @@
 import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.api.entity.ai.goal.builtin.creature.target.FindNearestAttackableTargetGoal;
-import org.spongepowered.api.entity.living.Creature;
 import org.spongepowered.api.entity.living.Living;
+import org.spongepowered.api.entity.living.PathfinderAgent;
 
 import java.util.Objects;
 import java.util.function.Predicate;
@@ -89,7 +89,7 @@ public FindNearestAttackableTargetGoal.Builder reset() {
     }
 
     @Override
-    public FindNearestAttackableTargetGoal build(Creature owner) {
+    public FindNearestAttackableTargetGoal build(PathfinderAgent owner) {
         Objects.requireNonNull(owner);
         Objects.requireNonNull(this.targetClass);
 

src/main/java/org/spongepowered/common/event/tracking/context/transaction/world/EntityPerformingDropsTransaction.java

@@ -31,7 +31,6 @@
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.MobSpawnType;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;

src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/entity/FlyingMobMixin_API.java

@@ -25,7 +25,7 @@
 package org.spongepowered.common.mixin.api.minecraft.world.entity;
 
 import net.minecraft.world.entity.FlyingMob;
-import org.spongepowered.api.entity.living.Aerial;
+import org.spongepowered.api.entity.Aerial;
 import org.spongepowered.asm.mixin.Mixin;
 
 @Mixin(FlyingMob.class)

src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/entity/PathfinderMobMixin_API.java

@@ -25,10 +25,10 @@
 package org.spongepowered.common.mixin.api.minecraft.world.entity;
 
 import net.minecraft.world.entity.PathfinderMob;
-import org.spongepowered.api.entity.living.Creature;
+import org.spongepowered.api.entity.living.PathfinderAgent;
 import org.spongepowered.asm.mixin.Mixin;
 
 @Mixin(PathfinderMob.class)
-public abstract class PathfinderMobMixin_API extends MobMixin_API implements Creature {
+public abstract class PathfinderMobMixin_API extends MobMixin_API implements PathfinderAgent {
 
 }

src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/entity/ai/goal/AvoidEntityGoalMixin_API.java

@@ -27,8 +27,8 @@
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.ai.targeting.TargetingConditions;
 import org.spongepowered.api.entity.ai.goal.builtin.creature.AvoidLivingGoal;
-import org.spongepowered.api.entity.living.Creature;
 import org.spongepowered.api.entity.living.Living;
+import org.spongepowered.api.entity.living.PathfinderAgent;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Mutable;
@@ -39,7 +39,7 @@
 
 @SuppressWarnings({"unchecked"})
 @Mixin(net.minecraft.world.entity.ai.goal.AvoidEntityGoal.class)
-public abstract class AvoidEntityGoalMixin_API extends GoalMixin_API<Creature> implements AvoidLivingGoal {
+public abstract class AvoidEntityGoalMixin_API extends GoalMixin_API<PathfinderAgent> implements AvoidLivingGoal {
 
     private static final Predicate<LivingEntity> ALWAYS_TRUE = e -> true;
 

src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/entity/ai/goal/RandomStrollGoalMixin_API.java

@@ -25,14 +25,14 @@
 package org.spongepowered.common.mixin.api.minecraft.world.entity.ai.goal;
 
 import org.spongepowered.api.entity.ai.goal.builtin.creature.RandomWalkingGoal;
-import org.spongepowered.api.entity.living.Creature;
+import org.spongepowered.api.entity.living.PathfinderAgent;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Mutable;
 import org.spongepowered.asm.mixin.Shadow;
 
 @Mixin(net.minecraft.world.entity.ai.goal.RandomStrollGoal.class)
-public abstract class RandomStrollGoalMixin_API extends GoalMixin_API<Creature> implements RandomWalkingGoal {
+public abstract class RandomStrollGoalMixin_API extends GoalMixin_API<PathfinderAgent> implements RandomWalkingGoal {
 
     // @formatter:off
     @Shadow @Final @Mutable protected double speedModifier;

src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/entity/animal/allay/AllayMixin_API.java

@@ -25,7 +25,7 @@
 package org.spongepowered.common.mixin.api.minecraft.world.entity.animal.allay;
 
 import org.spongepowered.api.data.value.Value;
-import org.spongepowered.api.entity.living.animal.Allay;
+import org.spongepowered.api.entity.living.Allay;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.common.mixin.api.minecraft.world.entity.PathfinderMobMixin_API;
 

src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/entity/monster/HoglinMixin_API.java

@@ -24,7 +24,7 @@
  */
 package org.spongepowered.common.mixin.api.minecraft.world.entity.monster;
 
-import org.spongepowered.api.entity.living.monster.hoglin.Hoglin;
+import org.spongepowered.api.entity.living.animal.Hoglin;
 import org.spongepowered.asm.mixin.Mixin;
 
 @Mixin(net.minecraft.world.entity.monster.hoglin.Hoglin.class)

src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/entity/monster/MagmaCubeMixin_API.java

@@ -24,7 +24,7 @@
  */
 package org.spongepowered.common.mixin.api.minecraft.world.entity.monster;
 
-import org.spongepowered.api.entity.living.monster.slime.MagmaCube;
+import org.spongepowered.api.entity.living.slime.MagmaCube;
 import org.spongepowered.asm.mixin.Mixin;
 
 @Mixin(net.minecraft.world.entity.monster.MagmaCube.class)

src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/entity/monster/RangedAttackMobMixin_API.java

@@ -25,7 +25,7 @@
 package org.spongepowered.common.mixin.api.minecraft.world.entity.monster;
 
 import net.minecraft.world.entity.monster.RangedAttackMob;
-import org.spongepowered.api.entity.living.Ranger;
+import org.spongepowered.api.entity.Ranger;
 import org.spongepowered.asm.mixin.Mixin;
 
 @Mixin(RangedAttackMob.class)

src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/entity/monster/SlimeMixin_API.java

@@ -26,7 +26,7 @@
 
 import org.spongepowered.api.data.Keys;
 import org.spongepowered.api.data.value.Value;
-import org.spongepowered.api.entity.living.monster.slime.Slime;
+import org.spongepowered.api.entity.living.slime.Slime;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.common.mixin.api.minecraft.world.entity.MobMixin_API;
 

src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/entity/monster/StriderMixin_API.java

@@ -24,7 +24,7 @@
  */
 package org.spongepowered.common.mixin.api.minecraft.world.entity.monster;
 
-import org.spongepowered.api.entity.living.monster.Strider;
+import org.spongepowered.api.entity.living.animal.Strider;
 import org.spongepowered.asm.mixin.Mixin;
 
 @Mixin(net.minecraft.world.entity.monster.Strider.class)

src/test/java/org/spongepowered/common/util/TypeTokenUtilTest.java

@@ -37,7 +37,7 @@
 import org.spongepowered.api.data.value.Value;
 import org.spongepowered.api.entity.living.Living;
 import org.spongepowered.api.entity.living.monster.boss.dragon.EnderDragon;
-import org.spongepowered.api.entity.living.monster.slime.Slime;
+import org.spongepowered.api.entity.living.slime.Slime;
 import org.spongepowered.common.data.value.SpongeValue;
 
 public final class TypeTokenUtilTest {

vanilla/src/mixins/java/org/spongepowered/vanilla/mixin/core/world/entity/LivingEntityMixin_Attack_impl.java

@@ -32,7 +32,6 @@
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.damagesource.CombatRules;
 import net.minecraft.world.damagesource.DamageSource;
-import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.LivingEntity;
@@ -41,7 +40,6 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import org.apache.logging.log4j.Level;
-import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;