Auxilor · Aug 3, 2024 · Aug 3, 2024 · Aug 15, 2024 · Aug 15, 2024 · Aug 19, 2024
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 buildscript {
@@ -6,39 +7,38 @@ buildscript {
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0")
     }
 }
 
 plugins {
     java
     id("java-library")
-    id("io.github.goooler.shadow") version "8.1.7"
+    id("com.gradleup.shadow") version "8.3.5"
     id("maven-publish")
 }
 
 allprojects {
     apply(plugin = "kotlin")
     apply(plugin = "java")
     apply(plugin = "maven-publish")
-    apply(plugin = "io.github.goooler.shadow")
+    apply(plugin = "com.gradleup.shadow")
 
     repositories {
+        mavenLocal() // TODO: REMOVE
         mavenCentral()
-        mavenLocal()
         maven("https://repo.auxilor.io/repository/maven-public/")
         maven("https://repo.papermc.io/repository/maven-public/")
         maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
         maven("https://repo.codemc.io/repository/maven-public/")
         maven("https://maven.enginehub.org/repo/")
         maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
         maven("https://maven.citizensnpcs.co/repo")
-        maven("https://nexuslite.gcnt.net/repos/other/")
     }
 
     dependencies {
         compileOnly("org.jetbrains:annotations:23.0.0")
-        compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.9.20")
+        compileOnly(kotlin("stdlib", version = "2.1.0"))
 
         compileOnly(fileTree("lib") { include("*.jar") })
     }
@@ -69,8 +69,8 @@ allprojects {
         }
 
         withType<KotlinCompile> {
-            kotlinOptions {
-                jvmTarget = "17"
+            compilerOptions {
+                jvmTarget.set(JvmTarget.JVM_17)
             }
         }
 

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -3,7 +3,7 @@ version = rootProject.version
 
 subprojects {
     dependencies {
-        compileOnly("com.willfp:eco:6.73.0")
+        compileOnly("com.willfp:eco:6.75.0")
     }
 }
 

diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts
@@ -23,7 +23,6 @@ dependencies {
     compileOnly("net.citizensnpcs:citizens-main:2.0.31-SNAPSHOT") {
         exclude(group = "net.byteflux", module = "libby-bukkit")
     }
-    compileOnly("com.dfsek.terra:common:6.4.1-BETA+3aef97738")
 
     compileOnly(fileTree("../../lib") {
         include("*.jar")

diff --git a/core/common/src/main/kotlin/com/willfp/libreforge/EntityRefreshListener.kt b/core/common/src/main/kotlin/com/willfp/libreforge/EntityRefreshListener.kt
@@ -0,0 +1,34 @@
+package com.willfp.libreforge
+
+import com.willfp.eco.core.EcoPlugin
+import org.bukkit.attribute.Attribute
+import org.bukkit.attribute.AttributeInstance
+import org.bukkit.entity.LivingEntity
+import org.bukkit.entity.Player
+import org.bukkit.event.EventHandler
+import org.bukkit.event.Listener
+import org.bukkit.event.world.ChunkLoadEvent
+
+class EntityRefreshListener(
+    private val plugin: EcoPlugin
+) : Listener {
+
+    @EventHandler
+    fun onChunkLoad(event: ChunkLoadEvent) {
+        event.chunk.entities.filterIsInstance<LivingEntity>()
+            .filterNot { it is Player }
+            .forEach { entity ->
+                removeEcoAttributeModifiers(entity)
+            }
+    }
+
+    private fun removeEcoAttributeModifiers(entity: LivingEntity) {
+        for (attribute in Attribute.entries) {
+            val attributeInstance: AttributeInstance = entity.getAttribute(attribute) ?: continue
+
+            attributeInstance.modifiers
+                .filter { modifier -> modifier.name.matches(Regex("\\d+_\\d+")) }
+                .forEach { modifier -> attributeInstance.removeModifier(modifier) }
+        }
+    }
+}
diff --git a/core/common/src/main/kotlin/com/willfp/libreforge/HolderUpdates.kt b/core/common/src/main/kotlin/com/willfp/libreforge/HolderUpdates.kt
@@ -29,6 +29,10 @@ class ItemRefreshListener(
 
     @EventHandler(priority = EventPriority.LOWEST)
     fun onItemPickup(event: EntityPickupItemEvent) {
+        if (!plugin.configYml.getBool("refresh.pickup.enabled")) {
+            return
+        }
+
         if (plugin.configYml.getBool("refresh.pickup.require-meta")) {
             if (!event.item.itemStack.hasItemMeta()) {
                 return

diff --git a/core/common/src/main/kotlin/com/willfp/libreforge/LibreforgeSpigotPlugin.kt b/core/common/src/main/kotlin/com/willfp/libreforge/LibreforgeSpigotPlugin.kt
@@ -19,9 +19,9 @@ import com.willfp.libreforge.integrations.auraskills.AuraSkillsIntegration
 import com.willfp.libreforge.integrations.aureliumskills.AureliumSkillsIntegration
 import com.willfp.libreforge.integrations.axenvoy.AxEnvoyIntegration
 import com.willfp.libreforge.integrations.citizens.CitizensIntegration
-import com.willfp.libreforge.integrations.votifier.VotifierIntegration
 import com.willfp.libreforge.integrations.custombiomes.impl.CustomBiomesTerra
 import com.willfp.libreforge.integrations.custombiomes.impl.CustomBiomesTerraformGenerator
+import com.willfp.libreforge.integrations.fancynpcs.FancyNPCsIntegration
 import com.willfp.libreforge.integrations.jobs.JobsIntegration
 import com.willfp.libreforge.integrations.levelledmobs.LevelledMobsIntegration
 import com.willfp.libreforge.integrations.mcmmo.McMMOIntegration
@@ -31,6 +31,7 @@ import com.willfp.libreforge.integrations.scyther.ScytherIntegration
 import com.willfp.libreforge.integrations.tab.TabIntegration
 import com.willfp.libreforge.integrations.tmmobcoins.TMMobcoinsIntegration
 import com.willfp.libreforge.integrations.vault.VaultIntegration
+import com.willfp.libreforge.integrations.votifier.VotifierIntegration
 import com.willfp.libreforge.integrations.worldguard.WorldGuardIntegration
 import com.willfp.libreforge.levels.LevelTypes
 import com.willfp.libreforge.levels.placeholder.*
@@ -169,7 +170,8 @@ class LibreforgeSpigotPlugin : EcoPlugin() {
     override fun loadListeners(): List<Listener> {
         val listeners = mutableListOf(
             EffectDataFixer,
-            ItemRefreshListener(this)
+            ItemRefreshListener(this),
+            EntityRefreshListener(this)
         )
 
         if (Prerequisite.HAS_PAPER.isMet) {
@@ -195,8 +197,9 @@ class LibreforgeSpigotPlugin : EcoPlugin() {
             IntegrationLoader("Terra") { CustomBiomesTerra.load(this) },
             IntegrationLoader("TerraformGenerator") { CustomBiomesTerraformGenerator.load(this) },
             IntegrationLoader("AxEnvoy") { AxEnvoyIntegration.load(this) },
-            IntegrationLoader("Votifier") { VotifierIntegration.load(this)},
-            IntegrationLoader("ModelEngine") { ModelEngineIntegration.load(this) }
+            IntegrationLoader("Votifier") { VotifierIntegration.load(this) },
+            IntegrationLoader("ModelEngine") { ModelEngineIntegration.load(this) },
+            IntegrationLoader("FancyNpcs") { FancyNPCsIntegration.load(this) }
         )
     }
 

diff --git a/core/common/src/main/kotlin/com/willfp/libreforge/Utils.kt b/core/common/src/main/kotlin/com/willfp/libreforge/Utils.kt
@@ -1,6 +1,7 @@
 package com.willfp.libreforge
 
 import com.willfp.eco.core.items.Items
+import com.willfp.eco.util.namespacedKeyOf
 import com.willfp.libreforge.proxy.Proxy
 import com.willfp.libreforge.proxy.loadProxy
 import org.bukkit.Bukkit
@@ -93,8 +94,14 @@ fun ItemStack.applyDamage(damage: Int, player: Player?): Boolean {
 }
 
 // 1.21 compat
-fun getEnchantment(id: String): Enchantment? =
-    Enchantment.getByKey(NamespacedKey.minecraft(id))
+fun getEnchantment(id: String): Enchantment? {
+    if (id.contains(':')) {
+        val key = namespacedKeyOf(id)
+        return Enchantment.getByKey(key)
+    } else {
+        return Enchantment.getByKey(NamespacedKey.minecraft(id))
+    }
+}
 
 @Proxy("OpenInventoryAccessorImpl")
 interface OpenInventoryAccessor {

diff --git a/core/common/src/main/kotlin/com/willfp/libreforge/Weighted.kt b/core/common/src/main/kotlin/com/willfp/libreforge/Weighted.kt
@@ -11,17 +11,23 @@ data class WeightedItems(
     override val weight: Double
 ) : Weighted
 
-class WeightedList<T : Weighted>(
+open class WeightedList<T : Weighted>(
     list: List<T>
 ) : DelegatedList<T>(list) {
+    fun random() = this.randomOrNull() ?: throw NoSuchElementException("List is empty")
+
     fun randomOrNull(): T? {
         if (this.isEmpty()) {
             return null
         }
 
         val totalWeight = this.sumOf { it.weight }
-        val random = Math.random() * totalWeight
+        if (totalWeight == 0.0) {
+            val randomIndex = (Math.random() * this.size).toInt()
+            return this[randomIndex]
+        }
 
+        val random = Math.random() * totalWeight
         var current = 0.0
         for (item in this) {
             current += item.weight

diff --git a/core/common/src/main/kotlin/com/willfp/libreforge/commands/CommandPointsGet.kt b/core/common/src/main/kotlin/com/willfp/libreforge/commands/CommandPointsGet.kt
@@ -27,7 +27,7 @@ internal class CommandPointsGet(plugin: EcoPlugin): Subcommand(
 
         val player = Bukkit.getPlayer(playerString)
 
-        if (player == null && playerString.equals("global", ignoreCase = true)) {
+        if (player == null && !playerString.equals("global", ignoreCase = true)) {
             sender.sendMessage(plugin.langYml.getMessage("invalid-player"))
             return
         }

diff --git a/core/common/src/main/kotlin/com/willfp/libreforge/commands/CommandPointsGive.kt b/core/common/src/main/kotlin/com/willfp/libreforge/commands/CommandPointsGive.kt
@@ -27,7 +27,7 @@ internal class CommandPointsGive(plugin: EcoPlugin): Subcommand(
 
         val player = Bukkit.getPlayer(playerString)
 
-        if (player == null && playerString.equals("global", ignoreCase = true)) {
+        if (player == null && !playerString.equals("global", ignoreCase = true)) {
             sender.sendMessage(plugin.langYml.getMessage("invalid-player"))
             return
         }

diff --git a/core/common/src/main/kotlin/com/willfp/libreforge/commands/CommandPointsSet.kt b/core/common/src/main/kotlin/com/willfp/libreforge/commands/CommandPointsSet.kt
@@ -27,7 +27,7 @@ internal class CommandPointsSet(plugin: EcoPlugin): Subcommand(
 
         val player = Bukkit.getPlayer(playerString)
 
-        if (player == null && playerString.equals("global", ignoreCase = true)) {
+        if (player == null && !playerString.equals("global", ignoreCase = true)) {
             sender.sendMessage(plugin.langYml.getMessage("invalid-player"))
             return
         }

diff --git a/core/common/src/main/kotlin/com/willfp/libreforge/commands/CommandPointsTake.kt b/core/common/src/main/kotlin/com/willfp/libreforge/commands/CommandPointsTake.kt
@@ -27,7 +27,7 @@ internal class CommandPointsTake(plugin: EcoPlugin): Subcommand(
 
         val player = Bukkit.getPlayer(playerString)
 
-        if (player == null && playerString.equals("global", ignoreCase = true)) {
+        if (player == null && !playerString.equals("global", ignoreCase = true)) {
             sender.sendMessage(plugin.langYml.getMessage("invalid-player"))
             return
         }

diff --git a/core/common/src/main/kotlin/com/willfp/libreforge/commands/CommandTrigger.kt b/core/common/src/main/kotlin/com/willfp/libreforge/commands/CommandTrigger.kt
@@ -2,6 +2,7 @@ package com.willfp.libreforge.commands
 
 import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.command.impl.Subcommand
+import com.willfp.eco.util.formatEco
 import com.willfp.libreforge.Dispatcher
 import com.willfp.libreforge.GlobalDispatcher
 import com.willfp.libreforge.get
@@ -62,7 +63,8 @@ internal class CommandTrigger(
             return
         }
 
-        val value = args.getOrNull(2)?.toDoubleOrNull()
+        val value = args.getOrNull(2)?.formatEco(Bukkit.getPlayer(dispatcherName), true)
+            ?.toDoubleOrNull()
 
         for (dispatcher in dispatchers) {
             TriggerGroupCustom.create(trigger).dispatch(

diff --git a/.../src/main/kotlin/com/willfp/libreforge/conditions/impl/ConditionPlaceholderGreaterThan.kt b/.../src/main/kotlin/com/willfp/libreforge/conditions/impl/ConditionPlaceholderGreaterThan.kt
@@ -25,7 +25,7 @@ object ConditionPlaceholderGreaterThan : Condition<NoCompileData>("placeholder_g
     ): Boolean {
         val player = dispatcher.get<Player>()
 
-        return (config.getFormattedString("placeholder", placeholderContext(player = player))
-            .toDoubleOrNull() ?: 0.0) > config.getDoubleFromExpression("value", player)
+        return (config.getDoubleFromExpression("placeholder", placeholderContext(player = player))) >=
+                config.getDoubleFromExpression("value", placeholderContext(player = player))
     }
 }
diff --git a/...mon/src/main/kotlin/com/willfp/libreforge/conditions/impl/ConditionPlaceholderLessThan.kt b/...mon/src/main/kotlin/com/willfp/libreforge/conditions/impl/ConditionPlaceholderLessThan.kt
@@ -25,7 +25,7 @@ object ConditionPlaceholderLessThan : Condition<NoCompileData>("placeholder_less
     ): Boolean {
         val player = dispatcher.get<Player>()
 
-        return (config.getFormattedString("placeholder", placeholderContext(player = player))
-            .toDoubleOrNull() ?: 0.0) < config.getDoubleFromExpression("value", player)
+        return (config.getDoubleFromExpression("placeholder", placeholderContext(player = player))) <
+                config.getDoubleFromExpression("value", placeholderContext(player = player))
     }
 }
diff --git a/core/common/src/main/kotlin/com/willfp/libreforge/counters/bind/BoundCounters.kt b/core/common/src/main/kotlin/com/willfp/libreforge/counters/bind/BoundCounters.kt
@@ -3,12 +3,13 @@ package com.willfp.libreforge.counters.bind
 import com.willfp.eco.core.map.listMap
 import com.willfp.libreforge.counters.Accumulator
 import com.willfp.libreforge.counters.Counter
+import net.kyori.adventure.chat.ChatType.Bound
 
 internal object BoundCounters {
     private val bindings = listMap<Counter, BoundCounter>()
 
     fun bind(counter: Counter, accumulator: Accumulator) {
-        bindings[counter] += BoundCounter(counter, accumulator)
+        bindings[counter].add(BoundCounter(counter, accumulator))
     }
 
     fun unbind(counter: Counter) {

diff --git a/core/common/src/main/kotlin/com/willfp/libreforge/effects/Chain.kt b/core/common/src/main/kotlin/com/willfp/libreforge/effects/Chain.kt
@@ -1,6 +1,5 @@
 package com.willfp.libreforge.effects
 
-import com.willfp.libreforge.DelegatedList
 import com.willfp.libreforge.Dispatcher
 import com.willfp.libreforge.WeightedList
 import com.willfp.libreforge.effects.executors.ChainExecutor
@@ -18,7 +17,7 @@ import org.bukkit.entity.Player
 class Chain internal constructor(
     effects: WeightedList<ChainElement<*>>,
     private val executor: ChainExecutor
-) : DelegatedList<ChainElement<*>>(
+) : WeightedList<ChainElement<*>>(
     effects.sortedBy {
         it.runOrder.weight
     }

diff --git a/core/common/src/main/kotlin/com/willfp/libreforge/effects/EffectContext.kt b/core/common/src/main/kotlin/com/willfp/libreforge/effects/EffectContext.kt
@@ -9,6 +9,7 @@ import com.willfp.libreforge.mutators.MutatorList
  * EffectContext exists in order to abstract out some compile logic between
  * element compilation and rich chain compilation.
  */
+@ConsistentCopyVisibility
 data class EffectContext internal constructor(
     val arguments: EffectArgumentList,
     val conditions: ConditionList,

diff --git a/core/common/src/main/kotlin/com/willfp/libreforge/effects/arguments/impl/ArgumentCooldown.kt b/core/common/src/main/kotlin/com/willfp/libreforge/effects/arguments/impl/ArgumentCooldown.kt
@@ -2,6 +2,7 @@ package com.willfp.libreforge.effects.arguments.impl
 
 import com.willfp.eco.core.config.interfaces.Config
 import com.willfp.eco.util.PlayerUtils
+import com.willfp.eco.util.SoundUtils
 import com.willfp.eco.util.StringUtils
 import com.willfp.eco.util.formatEco
 import com.willfp.libreforge.ConfigurableElement
@@ -79,7 +80,7 @@ object ArgumentCooldown : EffectArgument<Chain?>("cooldown") {
             if (plugin.configYml.getBool("cooldown.sound.enabled")) {
                 player.playSound(
                     player.location,
-                    Sound.valueOf(plugin.configYml.getString("cooldown.sound.sound").uppercase()),
+                    SoundUtils.getSound(plugin.configYml.getString("cooldown.sound.sound"))!!,
                     1.0f,
                     plugin.configYml.getDouble("cooldown.sound.pitch").toFloat()
                 )

diff --git a/core/common/src/main/kotlin/com/willfp/libreforge/effects/arguments/impl/ArgumentCost.kt b/core/common/src/main/kotlin/com/willfp/libreforge/effects/arguments/impl/ArgumentCost.kt
@@ -3,6 +3,7 @@ package com.willfp.libreforge.effects.arguments.impl
 import com.willfp.eco.core.integrations.economy.balance
 import com.willfp.eco.util.NumberUtils
 import com.willfp.eco.util.PlayerUtils
+import com.willfp.eco.util.SoundUtils
 import com.willfp.eco.util.StringUtils
 import com.willfp.libreforge.ConfigurableElement
 import com.willfp.libreforge.NoCompileData
@@ -42,7 +43,7 @@ object ArgumentCost : EffectArgument<NoCompileData>("cost") {
         if (plugin.configYml.getBool("cannot-afford.sound.enabled")) {
             player.playSound(
                 player.location,
-                Sound.valueOf(plugin.configYml.getString("cannot-afford.sound.sound").uppercase()),
+                SoundUtils.getSound(plugin.configYml.getString("cannot-afford.sound.sound"))!!,
                 1.0f,
                 plugin.configYml.getDouble("cannot-afford.sound.pitch").toFloat()
             )

diff --git a/.../common/src/main/kotlin/com/willfp/libreforge/effects/arguments/impl/ArgumentPointCost.kt b/.../common/src/main/kotlin/com/willfp/libreforge/effects/arguments/impl/ArgumentPointCost.kt
@@ -2,6 +2,7 @@ package com.willfp.libreforge.effects.arguments.impl
 
 import com.willfp.eco.util.NumberUtils
 import com.willfp.eco.util.PlayerUtils
+import com.willfp.eco.util.SoundUtils
 import com.willfp.eco.util.StringUtils
 import com.willfp.libreforge.ConfigurableElement
 import com.willfp.libreforge.NoCompileData
@@ -48,7 +49,7 @@ object ArgumentPointCost : EffectArgument<NoCompileData>("point_cost") {
         if (plugin.configYml.getBool("cannot-afford-type.sound.enabled")) {
             player.playSound(
                 player.location,
-                Sound.valueOf(plugin.configYml.getString("cannot-afford-type.sound.sound").uppercase()),
+                SoundUtils.getSound(plugin.configYml.getString("cannot-afford-type.sound.sound"))!!,
                 1.0f,
                 plugin.configYml.getDouble("cannot-afford-type.sound.pitch").toFloat()
             )

diff --git a/core/common/src/main/kotlin/com/willfp/libreforge/effects/arguments/impl/ArgumentPrice.kt b/core/common/src/main/kotlin/com/willfp/libreforge/effects/arguments/impl/ArgumentPrice.kt
@@ -3,6 +3,7 @@ package com.willfp.libreforge.effects.arguments.impl
 import com.willfp.eco.core.price.Prices
 import com.willfp.eco.util.NumberUtils
 import com.willfp.eco.util.PlayerUtils
+import com.willfp.eco.util.SoundUtils
 import com.willfp.eco.util.StringUtils
 import com.willfp.libreforge.ConfigurableElement
 import com.willfp.libreforge.NoCompileData
@@ -76,7 +77,7 @@ object ArgumentPrice : EffectArgument<NoCompileData>("price") {
         if (plugin.configYml.getBool("cannot-afford-price.sound.enabled")) {
             player.playSound(
                 player.location,
-                Sound.valueOf(plugin.configYml.getString("cannot-afford-price.sound.sound").uppercase()),
+                SoundUtils.getSound(plugin.configYml.getString("cannot-afford-price.sound.sound"))!!,
                 1.0f,
                 plugin.configYml.getDouble("cannot-afford-price.sound.pitch").toFloat()
             )