Switched class-based entity restrictions to TestableEntity where possible

eco-api/src/main/java/com/willfp/eco/core/entities/ai/target/TargetGoalNearestAttackable.java

@@ -6,31 +6,29 @@ import com.willfp.eco.core.entities.TestableEntity;
 import com.willfp.eco.core.entities.ai.TargetGoal;
 import com.willfp.eco.core.serialization.KeyedDeserializer;
 import org.bukkit.NamespacedKey;
-import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Mob;
+import org.bukkit.entity.Raider;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Objects;
 import java.util.function.Predicate;
 
 /**
  * Allows an entity to attack the closest target within a given subset of specific target types.
  *
- * @param targetClass      The types of entities to attack.
+ * @param target           The type of entities to attack.
  * @param checkVisibility  If visibility should be checked.
  * @param checkCanNavigate If navigation should be checked.
  * @param reciprocalChance 1 in reciprocalChance chance of not activating on any tick.
  * @param targetFilter     The filter for targets to match.
  */
 public record TargetGoalNearestAttackable(
-        @NotNull Class<? extends LivingEntity> targetClass,
+        @NotNull TestableEntity target,
         boolean checkVisibility,
         boolean checkCanNavigate,
         int reciprocalChance,
         @NotNull Predicate<LivingEntity> targetFilter
-) implements TargetGoal<Mob> {
+) implements TargetGoal<Raider> {
     /**
      * The deserializer for the goal.
      */
@@ -39,13 +37,12 @@ public record TargetGoalNearestAttackable(
     /**
      * Deserialize configs into the goal.
      */
-    @SuppressWarnings("unchecked")
     private static final class Deserializer implements KeyedDeserializer<TargetGoalNearestAttackable> {
         @Override
         @Nullable
         public TargetGoalNearestAttackable deserialize(@NotNull final Config config) {
             if (!(
-                    config.has("targetClass")
+                    config.has("target")
                             && config.has("checkVisibility")
                             && config.has("checkCanNavigate")
                             && config.has("reciprocalChance")
@@ -58,10 +55,7 @@ public record TargetGoalNearestAttackable(
                 TestableEntity filter = Entities.lookup(config.getString("targetFilter"));
 
                 return new TargetGoalNearestAttackable(
-                        (Class<? extends LivingEntity>)
-                                Objects.requireNonNull(
-                                        EntityType.valueOf(config.getString("avoidClass").toUpperCase()).getEntityClass()
-                                ),
+                        Entities.lookup(config.getString("target")),
                         config.getBool("checkVisibility"),
                         config.getBool("checkCanNavigate"),
                         config.getInt("reciprocalChance"),

eco-api/src/main/java/com/willfp/eco/core/entities/ai/target/TargetGoalNearestAttackableWitch.java

@@ -6,26 +6,24 @@ import com.willfp.eco.core.entities.TestableEntity;
 import com.willfp.eco.core.entities.ai.TargetGoal;
 import com.willfp.eco.core.serialization.KeyedDeserializer;
 import org.bukkit.NamespacedKey;
-import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Raider;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Objects;
 import java.util.function.Predicate;
 
 /**
  * Allows an entity to attack the closest target within a given subset of specific target types.
  *
- * @param targetClass      The types of entities to attack.
+ * @param target           The type of entities to attack.
  * @param checkVisibility  If visibility should be checked.
  * @param checkCanNavigate If navigation should be checked.
  * @param reciprocalChance 1 in reciprocalChance chance of not activating on any tick.
  * @param targetFilter     The filter for targets to match.
  */
 public record TargetGoalNearestAttackableWitch(
-        @NotNull Class<? extends LivingEntity> targetClass,
+        @NotNull TestableEntity target,
         boolean checkVisibility,
         boolean checkCanNavigate,
         int reciprocalChance,
@@ -39,13 +37,12 @@ public record TargetGoalNearestAttackableWitch(
     /**
      * Deserialize configs into the goal.
      */
-    @SuppressWarnings("unchecked")
     private static final class Deserializer implements KeyedDeserializer<TargetGoalNearestAttackableWitch> {
         @Override
         @Nullable
         public TargetGoalNearestAttackableWitch deserialize(@NotNull final Config config) {
             if (!(
-                    config.has("targetClass")
+                    config.has("target")
                             && config.has("checkVisibility")
                             && config.has("checkCanNavigate")
                             && config.has("reciprocalChance")
@@ -58,10 +55,7 @@ public record TargetGoalNearestAttackableWitch(
                 TestableEntity filter = Entities.lookup(config.getString("targetFilter"));
 
                 return new TargetGoalNearestAttackableWitch(
-                        (Class<? extends LivingEntity>)
-                                Objects.requireNonNull(
-                                        EntityType.valueOf(config.getString("avoidClass").toUpperCase()).getEntityClass()
-                                ),
+                        Entities.lookup(config.getString("target")),
                         config.getBool("checkVisibility"),
                         config.getBool("checkCanNavigate"),
                         config.getInt("reciprocalChance"),

eco-api/src/main/java/com/willfp/eco/core/entities/ai/target/TargetGoalNearestHealableRaider.java

@@ -6,24 +6,22 @@ import com.willfp.eco.core.entities.TestableEntity;
 import com.willfp.eco.core.entities.ai.TargetGoal;
 import com.willfp.eco.core.serialization.KeyedDeserializer;
 import org.bukkit.NamespacedKey;
-import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Raider;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Objects;
 import java.util.function.Predicate;
 
 /**
  * Target nearest attackable raider.
  *
- * @param targetClass     The types of entities to heal.
+ * @param target          The types of entities to heal.
  * @param checkVisibility If visibility should be checked.
  * @param targetFilter    The filter for targets to match.
  */
 public record TargetGoalNearestHealableRaider(
-        @NotNull Class<? extends LivingEntity> targetClass,
+        @NotNull TestableEntity target,
         boolean checkVisibility,
         @NotNull Predicate<LivingEntity> targetFilter
 ) implements TargetGoal<Raider> {
@@ -35,13 +33,12 @@ public record TargetGoalNearestHealableRaider(
     /**
      * Deserialize configs into the goal.
      */
-    @SuppressWarnings("unchecked")
     private static final class Deserializer implements KeyedDeserializer<TargetGoalNearestHealableRaider> {
         @Override
         @Nullable
         public TargetGoalNearestHealableRaider deserialize(@NotNull final Config config) {
             if (!(
-                    config.has("targetClass")
+                    config.has("target")
                             && config.has("checkVisibility")
                             && config.has("targetFilter")
             )) {
@@ -52,10 +49,7 @@ public record TargetGoalNearestHealableRaider(
                 TestableEntity filter = Entities.lookup(config.getString("targetFilter"));
 
                 return new TargetGoalNearestHealableRaider(
-                        (Class<? extends LivingEntity>)
-                                Objects.requireNonNull(
-                                        EntityType.valueOf(config.getString("avoidClass").toUpperCase()).getEntityClass()
-                                ),
+                        Entities.lookup(config.getString("target")),
                         config.getBool("checkVisibility"),
                         filter::matches
                 );

eco-api/src/main/java/com/willfp/eco/core/entities/ai/target/TargetGoalNonTameRandom.java

@@ -6,24 +6,22 @@ import com.willfp.eco.core.entities.TestableEntity;
 import com.willfp.eco.core.entities.ai.TargetGoal;
 import com.willfp.eco.core.serialization.KeyedDeserializer;
 import org.bukkit.NamespacedKey;
-import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Tameable;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Objects;
 import java.util.function.Predicate;
 
 /**
  * Target random non-tame entity.
  *
- * @param targetClass     The types of entities to heal.
+ * @param target          The types of entities to heal.
  * @param checkVisibility If visibility should be checked.
  * @param targetFilter    The filter for targets to match.
  */
 public record TargetGoalNonTameRandom(
-        @NotNull Class<? extends LivingEntity> targetClass,
+        @NotNull TestableEntity target,
         boolean checkVisibility,
         @NotNull Predicate<LivingEntity> targetFilter
 ) implements TargetGoal<Tameable> {
@@ -35,7 +33,6 @@ public record TargetGoalNonTameRandom(
     /**
      * Deserialize configs into the goal.
      */
-    @SuppressWarnings("unchecked")
     private static final class Deserializer implements KeyedDeserializer<TargetGoalNonTameRandom> {
         @Override
         @Nullable
@@ -52,10 +49,7 @@ public record TargetGoalNonTameRandom(
                 TestableEntity filter = Entities.lookup(config.getString("targetFilter"));
 
                 return new TargetGoalNonTameRandom(
-                        (Class<? extends LivingEntity>)
-                                Objects.requireNonNull(
-                                        EntityType.valueOf(config.getString("avoidClass").toUpperCase()).getEntityClass()
-                                ),
+                        Entities.lookup(config.getString("target")),
                         config.getBool("checkVisibility"),
                         filter::matches
                 );