libreforge-updater

LevelledMobs 4.0 Support

.github/workflows/publish-release.yml

@@ -15,11 +15,11 @@ jobs:
       - name: Checkout latest code
         uses: actions/checkout@v2
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v2
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
 
       - name: Change wrapper permissions
         run: chmod +x ./gradlew

build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
     `java-library`
     `maven-publish`
     kotlin("jvm") version "1.9.20"
-    id("com.github.johnrengelman.shadow") version "8.0.0"
+    id("io.github.goooler.shadow") version "8.1.7"
     id("com.willfp.libreforge-gradle-plugin") version "1.0.0"
 }
 
@@ -23,7 +23,7 @@ allprojects {
     apply(plugin = "java")
     apply(plugin = "kotlin")
     apply(plugin = "maven-publish")
-    apply(plugin = "com.github.johnrengelman.shadow")
+    apply(plugin = "io.github.goooler.shadow")
 
     repositories {
         mavenLocal()

eco-core/core-plugin/build.gradle.kts

@@ -3,7 +3,7 @@ version = rootProject.version
 
 dependencies {
     compileOnly("io.papermc.paper:paper-api:1.20.2-R0.1-SNAPSHOT")
-    compileOnly("com.github.lokka30:LevelledMobs:3.1.4")
+    compileOnly("io.github.arcaneplugins:levelledmobs-plugin:4.0.2")
     compileOnly("LibsDisguises:LibsDisguises:10.0.38")
     implementation("com.willfp:ModelEngineBridge:1.0.0")
 }

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

@@ -4,6 +4,7 @@ import com.willfp.eco.core.command.impl.PluginCommand
 import com.willfp.eco.core.display.DisplayModule
 import com.willfp.eco.core.entities.ai.EntityGoals
 import com.willfp.eco.core.integrations.IntegrationLoader
+import com.willfp.eco.util.toSingletonList
 import com.willfp.ecomobs.category.MobCategories
 import com.willfp.ecomobs.category.spawning.spawnpoints.SpawnPointGenerator
 import com.willfp.ecomobs.commands.CommandEcoMobs
@@ -19,8 +20,13 @@ import com.willfp.ecomobs.integrations.libsdisguises.IntegrationLibsDisguises
 import com.willfp.ecomobs.integrations.modelengine.IntegrationModelEngine
 import com.willfp.ecomobs.mob.EcoMobs
 import com.willfp.ecomobs.mob.damage.TopDamagerHandler
+import com.willfp.ecomobs.mob.impl.ecoMob
+import com.willfp.libreforge.EmptyProvidedHolder.holder
+import com.willfp.libreforge.EntityProvidedHolder
 import com.willfp.libreforge.loader.LibreforgePlugin
 import com.willfp.libreforge.loader.configs.ConfigCategory
+import com.willfp.libreforge.registerSpecificHolderProvider
+import org.bukkit.entity.Mob
 import org.bukkit.event.Listener
 
 internal lateinit var plugin: EcoMobsPlugin
@@ -34,6 +40,14 @@ class EcoMobsPlugin : LibreforgePlugin() {
         plugin = this
     }
 
+    override fun handleEnable() {
+        registerSpecificHolderProvider<Mob> {
+            it.ecoMob?.entityHolder.toSingletonList().map { holder ->
+                EntityProvidedHolder(holder, it)
+            }
+        }
+    }
+
     override fun handleLoad() {
         EntityGoals.register(EntityGoalRandomTeleport.Deserializer)
     }
@@ -52,7 +66,8 @@ class EcoMobsPlugin : LibreforgePlugin() {
             VanillaCompatibilityHandlers(),
             DiscoverRecipeListener(this),
             SpawnEggHandler(this),
-            SpawnTotemHandler()
+            SpawnTotemHandler(),
+            topDamagerHandler
         )
     }
 

eco-core/core-plugin/src/main/kotlin/com/willfp/ecomobs/category/spawning/impl/SpawnMethodFactoryReplace.kt

@@ -2,6 +2,7 @@ package com.willfp.ecomobs.category.spawning.impl
 
 import com.willfp.eco.core.config.interfaces.Config
 import com.willfp.eco.core.entities.Entities
+import com.willfp.eco.util.randDouble
 import com.willfp.ecomobs.EcoMobsPlugin
 import com.willfp.ecomobs.category.MobCategory
 import com.willfp.ecomobs.category.spawning.SpawnMethod
@@ -57,6 +58,10 @@ object SpawnMethodFactoryReplace : SpawnMethodFactory("replace") {
                 return
             }
 
+            if (randDouble(0.0, 100.0) > config.getDouble("chance")) {
+                return
+            }
+
             val mob = category.mobs.randomOrNull() ?: return
 
 

eco-core/core-plugin/src/main/kotlin/com/willfp/ecomobs/integrations/levelledmobs/IntegrationLevelledMobs.kt

@@ -3,7 +3,7 @@ package com.willfp.ecomobs.integrations.levelledmobs
 import com.willfp.eco.core.integrations.Integration
 import com.willfp.ecomobs.integrations.MobIntegration
 import com.willfp.ecomobs.mob.impl.ecoMob
-import me.lokka30.levelledmobs.events.MobPreLevelEvent
+import io.github.arcaneplugins.levelledmobs.events.MobPreLevelEvent
 import org.bukkit.entity.Mob
 import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener

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/EcoMob.kt

@@ -7,6 +7,7 @@ import com.willfp.ecomobs.category.MobCategory
 import com.willfp.ecomobs.integrations.MobIntegration
 import com.willfp.ecomobs.mob.event.MobEvent
 import com.willfp.ecomobs.mob.options.SpawnEgg
+import com.willfp.libreforge.Holder
 import com.willfp.libreforge.triggers.DispatchedTrigger
 import org.bukkit.Location
 import org.bukkit.entity.Mob
@@ -50,6 +51,11 @@ interface EcoMob : KRegistrable {
      */
     val customEntity: CustomEntity
 
+    /**
+     * The entity holder.
+     */
+    val entityHolder: Holder
+
     /**
      * Get a living mob from a bukkit mob.
      */

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

@@ -1,9 +1,11 @@
 package com.willfp.ecomobs.mob.damage
 
 import com.willfp.eco.util.savedDisplayName
+import com.willfp.eco.util.toNiceString
 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 +51,21 @@ class TopDamagerHandler(
 
     fun generatePlaceholders(mob: Mob): List<NamedValue> {
         return mob.topDamagers
-            .mapIndexed { index, damager ->
+            .flatMapIndexed { index, damager ->
-                NamedValue("top_damager_${index + 1}_name", Bukkit.getOfflinePlayer(damager.uuid).name ?: "Unknown")
+                listOf(
-                NamedValue("top_damager_${index + 1}_display", Bukkit.getOfflinePlayer(damager.uuid).savedDisplayName)
+                    NamedValue(
-                NamedValue("top_damager_${index + 1}_damage", damager.damage.toString())
+                        "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.toNiceString()
+                    )
+                )
             }
     }
 }

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

@@ -49,14 +49,19 @@ import com.willfp.ecomobs.tick.TickHandlerBossBar
 import com.willfp.ecomobs.tick.TickHandlerDisplayName
 import com.willfp.ecomobs.tick.TickHandlerLifespan
 import com.willfp.libreforge.ConfigViolation
+import com.willfp.libreforge.Holder
 import com.willfp.libreforge.ViolationContext
+import com.willfp.libreforge.conditions.ConditionList
 import com.willfp.libreforge.conditions.Conditions
+import com.willfp.libreforge.conditions.emptyConditionList
+import com.willfp.libreforge.effects.EffectList
 import com.willfp.libreforge.effects.Effects
 import com.willfp.libreforge.enumValueOfOrNull
 import com.willfp.libreforge.triggers.DispatchedTrigger
 import net.kyori.adventure.bossbar.BossBar
 import org.bukkit.Bukkit
 import org.bukkit.Location
+import org.bukkit.NamespacedKey
 import org.bukkit.entity.Mob
 import org.bukkit.entity.Player
 import org.bukkit.event.entity.CreatureSpawnEvent
@@ -309,6 +314,17 @@ internal class ConfigDrivenEcoMob(
         { (it as? Mob)?.ecoMob == this }
     ) {
         this.spawn(it, SpawnReason.COMMAND)!!.entity
+    }.apply { register() }
+
+    override val entityHolder = object : Holder {
+        override val id = plugin.createNamespacedKey(getID())
+
+        override val effects: EffectList = Effects.compile(
+            config.getSubsections("effects.permanent-effects"),
+            context.with("effects").with("permanent effects")
+        )
+
+        override val conditions = emptyConditionList()
     }
 
     /*
@@ -353,7 +369,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 +379,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?) {
+    override fun kill(player: Player?, removeTracking: Boolean) {
-        remove()
+        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()
-
+        if (removeTracking) {
-        entity.remove()
+            trackingRemovalCallback()
-        deathCallback()
+        }
 
         for (handler in this.tickHandlers) {
             handler.onRemove(this, tick)

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

@@ -26,6 +26,9 @@ spawning:
       - zombie
       - skeleton
 
+    # The chance for the mob to override, as a percentage
+    chance: 100
+
 
   # Options for custom spawning
   custom:

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!"

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

@@ -52,43 +52,59 @@ custom-ai:
   # How the mob should behave.
   entity-goals: [ ]
 
-# Effects are done from the player's perspective: to treat the player as the victim,
+# Some effects are ran from the perspective of the entity, and others from the perspective
-# either use self_as_victim in args, or use player_as_victim in mutators.
+# of the player - each section is marked with which perspective it is run from.
+
 # You can use display name placeholders in effects
 # You can also use top damager placeholders:
 # %top_damager_<place>_name%, %top_damager_<place>_damage%, %top_damager_<place>_display%
 effects:
+  # Effects that are active all the time
+  # Ran from the perspective of the entity
+  permanent-effects: [ ]
+
   # Effects ran when the mob spawns
+  # Ran from the perspective of the entity
   spawn: [ ]
 
   # Effects ran when the mob despawns
+  # Ran from the perspective of the entity
   despawn: [ ]
 
   # Effects ran when the player interacts with the mob
+  # Ran from the perspective of the player
   interact: [ ]
 
   # Effects ran when the player melee attacks the mob
+  # Ran from the perspective of the player
   melee-attack: [ ]
 
   # Effects ran when the player does a ranged attack on the mob
+  # Ran from the perspective of the player
   ranged-attack: [ ]
 
   # Effects ran when the player attacks the mob
+  # Ran from the perspective of the player
   any-attack: [ ]
 
   # Effects ran when the mob takes damage
+  # Ran from the perspective of the entity
   take-damage: [ ]
 
   # Effects ran when the player is damaged by the mob
+  # Ran from the perspective of the player
   damage-player: [ ]
 
   # Effects ran when the player is killed by the mob
+  # Ran from the perspective of the player
   kill-player: [ ]
 
   # Effects ran when the mob dies
+  # Ran from the perspective of the entity
   death: [ ]
 
   # Effects ran when the mob is killed by the player
+  # Ran from the perspective of the player
   kill: [ ]
 
 # The lifespan of the mob, in seconds. Set to -1 to disable.

gradle.properties

@@ -1,5 +1,5 @@
 #libreforge-updater
-#Sun Dec 24 14:55:22 CET 2023
+#Thu Jul 18 13:24:06 BST 2024
 kotlin.code.style=official
-libreforge-version=4.51.0
+libreforge-version=4.67.0
-version=10.0.0-b2
+version=10.12.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -2,12 +2,15 @@ pluginManagement {
     repositories {
         gradlePluginPortal()
         mavenLocal()
-        maven("https://repo.jpenilla.xyz/snapshots/")
         maven("https://repo.auxilor.io/repository/maven-public/")
         maven("https://repo.papermc.io/repository/maven-public/")
     }
 }
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
+
 rootProject.name = "EcoMobs"
 
 // Core