From e2086387e712ea0e1f15dff520d24178939e6c30 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Mon, 11 Apr 2022 14:51:36 +0100 Subject: [PATCH] Fixed custom AI not working --- .../com/willfp/ecobosses/bosses/EcoBoss.kt | 34 +++++-------------- 1 file changed, 8 insertions(+), 26 deletions(-) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/EcoBoss.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/EcoBoss.kt index 1936ce6..425bda6 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/EcoBoss.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/EcoBoss.kt @@ -5,11 +5,7 @@ import com.willfp.eco.core.config.interfaces.Config import com.willfp.eco.core.entities.CustomEntity import com.willfp.eco.core.entities.Entities import com.willfp.eco.core.entities.TestableEntity -import com.willfp.eco.core.entities.ai.EntityController -import com.willfp.eco.core.entities.ai.EntityGoal -import com.willfp.eco.core.entities.ai.EntityGoals -import com.willfp.eco.core.entities.ai.TargetGoal -import com.willfp.eco.core.entities.ai.TargetGoals +import com.willfp.eco.core.entities.ai.* import com.willfp.eco.core.items.CustomItem import com.willfp.eco.core.items.Items import com.willfp.eco.core.items.builder.ItemStackBuilder @@ -20,21 +16,8 @@ import com.willfp.eco.util.NamespacedKeyUtils import com.willfp.eco.util.toComponent import com.willfp.ecobosses.events.BossKillEvent import com.willfp.ecobosses.lifecycle.BossLifecycle -import com.willfp.ecobosses.tick.BossBarTicker -import com.willfp.ecobosses.tick.BossTicker -import com.willfp.ecobosses.tick.DisplayNameTicker -import com.willfp.ecobosses.tick.LifespanTicker -import com.willfp.ecobosses.tick.TargetTicker -import com.willfp.ecobosses.tick.TeleportHandler -import com.willfp.ecobosses.util.BossDrop -import com.willfp.ecobosses.util.CommandReward -import com.willfp.ecobosses.util.ConfiguredSound -import com.willfp.ecobosses.util.LocalBroadcast -import com.willfp.ecobosses.util.LocalCommands -import com.willfp.ecobosses.util.PlayableSound -import com.willfp.ecobosses.util.SpawnTotem -import com.willfp.ecobosses.util.XpReward -import com.willfp.ecobosses.util.topDamagers +import com.willfp.ecobosses.tick.* +import com.willfp.ecobosses.util.* import com.willfp.libreforge.Holder import com.willfp.libreforge.conditions.Conditions import com.willfp.libreforge.effects.Effects @@ -47,8 +30,7 @@ import org.bukkit.entity.Mob import org.bukkit.entity.Player import org.bukkit.inventory.ItemStack import org.bukkit.persistence.PersistentDataType -import java.util.Objects -import java.util.UUID +import java.util.* class EcoBoss( val config: Config, @@ -184,15 +166,15 @@ class EcoBoss( val targetGoals = config.getSubsections("customai.target-goals").mapNotNull { val key = NamespacedKeyUtils.fromStringOrNull(it.getString("key")) ?: return@mapNotNull null val deserializer = TargetGoals.getByKey(key) ?: return@mapNotNull null - val goal = deserializer.deserialize(config.getSubsection("args")) ?: return@mapNotNull null - ConfiguredGoal(config.getInt("priority"), goal) + val goal = deserializer.deserialize(it.getSubsection("args")) ?: return@mapNotNull null + ConfiguredGoal(it.getInt("priority"), goal) } val entityGoals = config.getSubsections("customai.ai-goals").mapNotNull { val key = NamespacedKeyUtils.fromStringOrNull(it.getString("key")) ?: return@mapNotNull null val deserializer = EntityGoals.getByKey(key) ?: return@mapNotNull null - val goal = deserializer.deserialize(config.getSubsection("args")) ?: return@mapNotNull null - ConfiguredGoal(config.getInt("priority"), goal) + val goal = deserializer.deserialize(it.getSubsection("args")) ?: return@mapNotNull null + ConfiguredGoal(it.getInt("priority"), goal) } val spawnConditions = config.getSubsections("spawn.conditions").mapNotNull {