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()
@@ -44,7 +44,7 @@ allprojects {
 
     java {
         withSourcesJar()
-        toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+        toolchain.languageVersion.set(JavaLanguageVersion.of(21))
     }
 
     tasks {
@@ -55,7 +55,7 @@ allprojects {
 
         compileKotlin {
             kotlinOptions {
-                jvmTarget = "17"
+                jvmTarget = "21"
             }
         }
 

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)
     }

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/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/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
@@ -311,6 +316,17 @@ internal class ConfigDrivenEcoMob(
         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()
+    }
+
     /*
     ----------
      */

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/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,
-# either use self_as_victim in args, or use player_as_victim in mutators.
+# Some effects are ran from the perspective of the entity, and others from the perspective
+# 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
-#Thu Jan 04 17:25:24 GMT 2024
+#Sat Jun 29 16:43:54 BST 2024
 kotlin.code.style=official
-libreforge-version=4.53.0
-version=10.0.0-b5
+libreforge-version=4.63.1
+version=10.8.1

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