libreforge-updater

eco-core/core-plugin/src/main/kotlin/com/willfp/ecomobs/EcoMobsPlugin.kt

@@ -52,7 +52,8 @@ class EcoMobsPlugin : LibreforgePlugin() {
             VanillaCompatibilityHandlers(),
             DiscoverRecipeListener(this),
             SpawnEggHandler(this),
-            SpawnTotemHandler()
+            SpawnTotemHandler(),
+            topDamagerHandler
         )
     }
 

eco-core/core-plugin/src/main/kotlin/com/willfp/ecomobs/integrations/modelengine/IntegrationModelEngine.kt

@@ -21,7 +21,7 @@ class IntegrationModelEngine : Listener, Integration {
 
         val modelled = ModelEngineBridge.instance.createModeledEntity(entity)
         modelled.addModel(model)
-        modelled.isBaseEntityVisible = true
+        modelled.isBaseEntityVisible = false
     }
 
     override fun getPluginName(): String {

eco-core/core-plugin/src/main/kotlin/com/willfp/ecomobs/mob/LivingMob.kt

@@ -27,7 +27,7 @@ interface LivingMob {
     /**
      * Kill the mob.
      */
-    fun kill(player: Player?)
+    fun kill(player: Player?, removeTracking: Boolean = true)
 
     /**
      * Despawn the mob.

eco-core/core-plugin/src/main/kotlin/com/willfp/ecomobs/mob/damage/TopDamagers.kt

@@ -4,6 +4,7 @@ import com.willfp.eco.util.savedDisplayName
 import com.willfp.eco.util.tryAsPlayer
 import com.willfp.ecomobs.EcoMobsPlugin
 import com.willfp.libreforge.NamedValue
+import com.willfp.libreforge.triggers.TriggerData
 import org.bukkit.Bukkit
 import org.bukkit.entity.Mob
 import org.bukkit.event.EventHandler
@@ -49,10 +50,21 @@ class TopDamagerHandler(
 
     fun generatePlaceholders(mob: Mob): List<NamedValue> {
         return mob.topDamagers
-            .mapIndexed { index, damager ->
-                NamedValue("top_damager_${index + 1}_name", Bukkit.getOfflinePlayer(damager.uuid).name ?: "Unknown")
-                NamedValue("top_damager_${index + 1}_display", Bukkit.getOfflinePlayer(damager.uuid).savedDisplayName)
-                NamedValue("top_damager_${index + 1}_damage", damager.damage.toString())
+            .flatMapIndexed { index, damager ->
+                listOf(
+                    NamedValue(
+                        "top_damager_${index + 1}_name",
+                        Bukkit.getOfflinePlayer(damager.uuid).name ?: "Unknown"
+                    ),
+                    NamedValue(
+                        "top_damager_${index + 1}_display",
+                        Bukkit.getOfflinePlayer(damager.uuid).savedDisplayName
+                    ),
+                    NamedValue(
+                        "top_damager_${index + 1}_damage",
+                        damager.damage.toString()
+                    )
+                )
             }
     }
 }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecomobs/mob/event/impl/MobEventKill.kt

@@ -33,6 +33,12 @@ object MobEventKill : MobEvent("kill") {
         Bukkit.getPluginManager().callEvent(EcoMobKillEvent(living, player))
 
         living.handleEvent(this, data.dispatch(player.toDispatcher()))
-        living.kill(player)
+
+        // Tracking isn't removed here because it's removed in MobEventDeath, which is called after this one.
+        // Otherwise, player kills wouldn't fire the death event.
+        living.kill(
+            player,
+            removeTracking = false
+        )
     }
 }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecomobs/mob/impl/ConfigDrivenEcoMob.kt

@@ -309,7 +309,7 @@ internal class ConfigDrivenEcoMob(
         { (it as? Mob)?.ecoMob == this }
     ) {
         this.spawn(it, SpawnReason.COMMAND)!!.entity
-    }
+    }.apply { register() }
 
     /*
     ----------
@@ -353,7 +353,6 @@ internal class ConfigDrivenEcoMob(
         return trackedMobs[uuid]
     }
 
-    @Suppress("UNCHECKED_CAST")
     override fun spawn(location: Location, reason: SpawnReason): LivingMob? {
         // Call bukkit event
         val preSpawnEvent = EcoMobPreSpawnEvent(this, reason)
@@ -364,7 +363,7 @@ internal class ConfigDrivenEcoMob(
         }
 
         // Spawn bukkit mob
-        val entity = mob.spawn(location) as? Mob ?: throw IllegalStateException("Mob is not a mob")
+        val entity = mob.spawn(location) as? Mob ?: throw IllegalStateException("Base entity must be a mob!")
 
         // Mark as custom mob
         entity.ecoMob = this

eco-core/core-plugin/src/main/kotlin/com/willfp/ecomobs/mob/impl/LivingMobImpl.kt

@@ -19,7 +19,7 @@ internal class LivingMobImpl(
     private val plugin: EcoMobsPlugin,
     override val mob: EcoMob,
     override val entity: Mob,
-    private val deathCallback: () -> Unit
+    private val trackingRemovalCallback: () -> Unit
 ) : LivingMob {
     private val ticker = plugin.runnableFactory.create {
         tick(tick)
@@ -27,13 +27,13 @@ internal class LivingMobImpl(
 
         if (!isAlive) {
             it.cancel()
-            remove()
+            handleRemove()
         }
     }
 
     private var isRunning = false
 
-    private var tick = 1
+    private var tick = 0
 
     private val tickHandlers = mutableListOf<TickHandler>()
 
@@ -77,25 +77,26 @@ internal class LivingMobImpl(
         mob.handleEvent(event, trigger)
     }
 
-    override fun kill(player: Player?) {
-        remove()
+    override fun kill(player: Player?, removeTracking: Boolean) {
+        handleRemove(removeTracking = removeTracking)
 
         mob.spawnDrops(entity.location, player)
     }
 
     override fun despawn() {
-        remove()
+        entity.remove()
+        handleRemove()
 
         Bukkit.getPluginManager().callEvent(
             EcoMobDespawnEvent(this)
         )
     }
 
-    private fun remove() {
+    private fun handleRemove(removeTracking: Boolean = true) {
         ticker.cancel()
-
-        entity.remove()
-        deathCallback()
+        if (removeTracking) {
+            trackingRemovalCallback()
+        }
 
         for (handler in this.tickHandlers) {
             handler.onRemove(this, tick)

eco-core/core-plugin/src/main/resources/eco.yml

@@ -4,6 +4,6 @@ environment:
 
 options:
   resource-id: 525
-  bstats-id: 10635
+  bstats-id: 20581
   color: "&9"
   proxy-package: "com.willfp.ecomobs.nms"

eco-core/core-plugin/src/main/resources/lang.yml

@@ -1,5 +1,5 @@
 messages:
-  prefix: "&9&lEcoMobs &f» "
+  prefix: "&9&lEcoMobs &8» &f"
   no-permission: "&cYou don't have permission to do this!"
   not-player: "&cThis command must be run by a player"
   invalid-command: "&cUnknown subcommand!"

gradle.properties

@@ -1,5 +1,5 @@
 #libreforge-updater
-#Sun Dec 24 14:55:22 CET 2023
+#Mon Jan 01 20:02:24 GMT 2024
 kotlin.code.style=official
-libreforge-version=4.51.0
-version=10.0.0-b2
+libreforge-version=4.52.0
+version=10.0.0-b3