Tempt now uses TestableItem

2022-03-02 19:12:59 +00:00
parent 2294c3758d
commit fbc7bb6f07
7 changed files with 157 additions and 15 deletions
--- a/eco-core/core-nms/nms-common/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/common/NMSCommons.kt
+++ b/eco-core/core-nms/nms-common/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/common/NMSCommons.kt
@@ -24,16 +24,19 @@ fun NamespacedKey.toResourceLocation(): ResourceLocation =
 fun ItemStack.asNMSStack(): net.minecraft.world.item.ItemStack =
    impl.asNMSStack(this)

+fun net.minecraft.world.item.ItemStack.asBukkitStack(): ItemStack =
+    impl.asBukkitStack(this)
+
 fun ItemStack.mergeIfNeeded(nmsStack: net.minecraft.world.item.ItemStack) =
    impl.mergeIfNeeded(this, nmsStack)

 fun LivingEntity.toBukkitEntity(): org.bukkit.entity.LivingEntity? =
    impl.toBukkitEntity(this)

-fun <T: EntityGoal<*>> T.getVersionSpecificEntityGoalFactory(): EntityGoalFactory<T>? =
+fun <T : EntityGoal<*>> T.getVersionSpecificEntityGoalFactory(): EntityGoalFactory<T>? =
    impl.getVersionSpecificEntityGoalFactory(this)

-fun <T: TargetGoal<*>> T.getVersionSpecificEntityGoalFactory(): TargetGoalFactory<T>? =
+fun <T : TargetGoal<*>> T.getVersionSpecificEntityGoalFactory(): TargetGoalFactory<T>? =
    impl.getVersionSpecificTargetGoalFactory(this)

 interface CommonsProvider {
@@ -45,6 +48,8 @@ interface CommonsProvider {

    fun asNMSStack(itemStack: ItemStack): net.minecraft.world.item.ItemStack

+    fun asBukkitStack(itemStack: net.minecraft.world.item.ItemStack): ItemStack
+
    fun mergeIfNeeded(itemStack: ItemStack, nmsStack: net.minecraft.world.item.ItemStack)

    fun toBukkitEntity(entity: LivingEntity): org.bukkit.entity.LivingEntity?
--- a/eco-core/core-nms/nms-common/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/common/ai/entity/TemptGoalFactory.kt
+++ b/eco-core/core-nms/nms-common/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/common/ai/entity/TemptGoalFactory.kt
@@ -1,20 +1,137 @@
 package com.willfp.eco.internal.spigot.proxy.common.ai.entity

 import com.willfp.eco.core.entities.ai.entity.EntityGoalTempt
+import com.willfp.eco.core.items.TestableItem
+import com.willfp.eco.core.recipe.parts.GroupedTestableItems
 import com.willfp.eco.internal.spigot.proxy.common.ai.EntityGoalFactory
-import com.willfp.eco.internal.spigot.proxy.common.asNMSStack
+import net.minecraft.world.entity.Entity
+import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.PathfinderMob
 import net.minecraft.world.entity.ai.goal.Goal
-import net.minecraft.world.entity.ai.goal.TemptGoal
-import net.minecraft.world.item.crafting.Ingredient
+import net.minecraft.world.entity.ai.targeting.TargetingConditions
+import org.bukkit.craftbukkit.v1_17_R1.entity.CraftLivingEntity
+import org.bukkit.craftbukkit.v1_17_R1.event.CraftEventFactory
+import org.bukkit.event.entity.EntityTargetEvent
+import java.util.EnumSet
+import kotlin.math.abs

 object TemptGoalFactory : EntityGoalFactory<EntityGoalTempt> {
    override fun create(apiGoal: EntityGoalTempt, entity: PathfinderMob): Goal {
-        return TemptGoal(
+        return EnhancedTemptGoal(
            entity,
            apiGoal.speed,
-            Ingredient.of(*apiGoal.items.map { it.asNMSStack() }.toTypedArray()),
+            GroupedTestableItems(apiGoal.items),
            apiGoal.canBeScared
        )
    }
 }
+
+@Suppress("NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS")
+class EnhancedTemptGoal(
+    private val mob: PathfinderMob,
+    private val speedModifier: Double,
+    private val item: TestableItem,
+    private val canScare: Boolean
+) : Goal() {
+    private val targetingConditions: TargetingConditions
+    private var px = 0.0
+    private var py = 0.0
+    private var pz = 0.0
+    private var pRotX = 0.0
+    private var pRotY = 0.0
+    private var player: LivingEntity? = null
+    private var calmDown = 0
+    private var isRunning = false
+
+    init {
+        setFlags(EnumSet.of(Flag.MOVE, Flag.LOOK))
+        targetingConditions = TEMP_TARGETING.copy().selector { shouldFollow(it) }
+    }
+
+    override fun canUse(): Boolean {
+        return if (calmDown > 0) {
+            --calmDown
+            false
+        } else {
+            player = mob.level.getNearestPlayer(targetingConditions, mob as LivingEntity)
+            // CraftBukkit start
+            if (player != null) {
+                val event = CraftEventFactory.callEntityTargetLivingEvent(
+                    mob,
+                    player,
+                    EntityTargetEvent.TargetReason.TEMPT
+                )
+                if (event.isCancelled) {
+                    return false
+                }
+                player = if (event.target == null) null else (event.target as CraftLivingEntity?)!!.handle
+            }
+            // CraftBukkit end
+            player != null
+        }
+    }
+
+    private fun shouldFollow(entity: LivingEntity): Boolean {
+        return item.matches(entity.mainHandItem.asBukkitCopy()) || item.matches(entity.offhandItem.asBukkitCopy())
+    }
+
+    override fun canContinueToUse(): Boolean {
+        if (canScare()) {
+            val p = player ?: return false
+
+            if (mob.distanceToSqr(p) < 36.0) {
+                if (p.distanceToSqr(px, py, pz) > 0.010000000000000002) {
+                    return false
+                }
+                if (abs(p.xRot.toDouble() - pRotX) > 5.0 || abs(
+                        p.getYRot().toDouble() - pRotY
+                    ) > 5.0
+                ) {
+                    return false
+                }
+            } else {
+                px = p.x
+                py = p.y
+                pz = p.z
+            }
+            pRotX = p.xRot.toDouble()
+            pRotY = p.getYRot().toDouble()
+        }
+        return canUse()
+    }
+
+    private fun canScare(): Boolean {
+        return canScare
+    }
+
+    override fun start() {
+        val p = player ?: return
+
+        px = p.x
+        py = p.y
+        pz = p.z
+        isRunning = true
+    }
+
+    override fun stop() {
+        player = null
+        mob.navigation.stop()
+        calmDown = 100
+        isRunning = false
+    }
+
+    override fun tick() {
+        player ?: return
+
+        mob.lookControl.setLookAt(player, (mob.maxHeadYRot + 20).toFloat(), mob.maxHeadXRot.toFloat())
+        if (mob.distanceToSqr(player as Entity) < 6.25) {
+            mob.navigation.stop()
+        } else {
+            mob.navigation.moveTo(player as Entity, speedModifier)
+        }
+    }
+
+    companion object {
+        private val TEMP_TARGETING = TargetingConditions.forNonCombat().range(10.0).ignoreLineOfSight()
+    }
+}
--- a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/CommonsInitializer.kt
+++ b/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/CommonsInitializer.kt
@@ -45,6 +45,10 @@ class CommonsInitializer : CommonsInitializerProxy {
            }
        }

+        override fun asBukkitStack(itemStack: net.minecraft.world.item.ItemStack): ItemStack {
+            return CraftItemStack.asBukkitCopy(itemStack)
+        }
+
        override fun mergeIfNeeded(itemStack: ItemStack, nmsStack: net.minecraft.world.item.ItemStack) {
            if (itemStack !is CraftItemStack) {
                itemStack.itemMeta = CraftItemStack.asCraftMirror(nmsStack).itemMeta
--- a/eco-core/core-nms/v1_18_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R1/CommonsInitializer.kt
+++ b/eco-core/core-nms/v1_18_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R1/CommonsInitializer.kt
@@ -45,6 +45,10 @@ class CommonsInitializer : CommonsInitializerProxy {
            }
        }

+        override fun asBukkitStack(itemStack: net.minecraft.world.item.ItemStack): ItemStack {
+            return CraftItemStack.asBukkitCopy(itemStack)
+        }
+
        override fun mergeIfNeeded(itemStack: ItemStack, nmsStack: net.minecraft.world.item.ItemStack) {
            if (itemStack !is CraftItemStack) {
                itemStack.itemMeta = CraftItemStack.asCraftMirror(nmsStack).itemMeta
--- a/eco-core/core-nms/v1_18_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R2/CommonsInitializer.kt
+++ b/eco-core/core-nms/v1_18_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R2/CommonsInitializer.kt
@@ -45,6 +45,10 @@ class CommonsInitializer : CommonsInitializerProxy {
            }
        }

+        override fun asBukkitStack(itemStack: net.minecraft.world.item.ItemStack): ItemStack {
+            return CraftItemStack.asBukkitCopy(itemStack)
+        }
+
        override fun mergeIfNeeded(itemStack: ItemStack, nmsStack: net.minecraft.world.item.ItemStack) {
            if (itemStack !is CraftItemStack) {
                itemStack.itemMeta = CraftItemStack.asCraftMirror(nmsStack).itemMeta