libreforge-updater

build.gradle.kts

@@ -37,11 +37,11 @@ allprojects {
     }
 
     dependencies {
-        compileOnly("com.willfp:eco:6.35.1")
+        compileOnly("com.willfp:eco:6.44.0")
         compileOnly("org.jetbrains:annotations:23.0.0")
         compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.7.10")
 
-        implementation("com.willfp:libreforge:3.114.0")
+        implementation("com.willfp:libreforge:3.117.0")
         implementation("org.joml:joml:1.10.4")
     }
 

eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/EcoBossesPlugin.kt

@@ -79,10 +79,6 @@ class EcoBossesPlugin : LibReforgePlugin() {
         )
     }
 
-    override fun getMinimumEcoVersion(): String {
-        return "6.35.1"
-    }
-
     companion object {
         @JvmStatic
         lateinit var instance: EcoBossesPlugin

eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/Bosses.kt

@@ -4,7 +4,7 @@ import com.google.common.collect.BiMap
 import com.google.common.collect.HashBiMap
 import com.google.common.collect.ImmutableList
 import com.willfp.eco.core.config.ConfigType
-import com.willfp.eco.core.config.TransientConfig
+import com.willfp.eco.core.config.readConfig
 import com.willfp.eco.core.config.updating.ConfigUpdater
 import com.willfp.ecobosses.EcoBossesPlugin
 import com.willfp.libreforge.separatorAmbivalent
@@ -54,7 +54,7 @@ object Bosses {
             addNewBoss(EcoBoss(id, config, plugin))
         }
 
-        val ecoBossesYml = TransientConfig(File(plugin.dataFolder, "ecobosses.yml"), ConfigType.YAML)
+        val ecoBossesYml = File(plugin.dataFolder, "ecobosses.yml").readConfig(ConfigType.YAML)
 
         for (bossConfig in ecoBossesYml.getSubsections("bosses")) {
             // Boss configs are separator ambivalent in order to preserve backwards compatibility

eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/EcoBoss.kt

@@ -305,13 +305,15 @@ class EcoBoss(
 
     private val currentlyAlive = mutableMapOf<UUID, LivingEcoBoss>()
 
-    override val conditions = config.getSubsections("conditions").mapNotNull {
+    override val conditions = Conditions.compile(
-        Conditions.compile(it, "Boss ID $id")
+        config.getSubsections("conditions"),
-    }.toSet()
+        "Boss ID $id"
+    )
 
-    override val effects = config.getSubsections("effects").mapNotNull {
+    override val effects = Effects.compile(
-        Effects.compile(it, "Boss ID $id")
+        config.getSubsections("effects"),
-    }.toSet()
+        "Boss ID $id"
+    )
 
     fun markDead(uuid: UUID) {
         currentlyAlive.remove(uuid)

eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/events/BossDeathEvent.kt

@@ -1,10 +1,8 @@
 package com.willfp.ecobosses.events
 
 import com.willfp.ecobosses.bosses.LivingEcoBoss
-import com.willfp.ecobosses.lifecycle.BossLifecycle
 import org.bukkit.event.Event
 import org.bukkit.event.HandlerList
-import org.bukkit.event.entity.EntityDeathEvent
 
 abstract class BossDeathEvent(
     val boss: LivingEcoBoss

eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/events/BossDespawnEvent.kt

@@ -1,7 +1,6 @@
 package com.willfp.ecobosses.events
 
 import com.willfp.ecobosses.bosses.LivingEcoBoss
-import com.willfp.ecobosses.lifecycle.BossLifecycle
 import org.bukkit.event.HandlerList
 
 class BossDespawnEvent(

eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/events/BossKillEvent.kt

@@ -1,7 +1,6 @@
 package com.willfp.ecobosses.events
 
 import com.willfp.ecobosses.bosses.LivingEcoBoss
-import com.willfp.ecobosses.lifecycle.BossLifecycle
 import org.bukkit.entity.Player
 import org.bukkit.event.HandlerList
 import org.bukkit.event.entity.EntityDeathEvent

eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/lifecycle/LifecycleHandlers.kt

@@ -1,7 +1,6 @@
 package com.willfp.ecobosses.lifecycle
 
 import com.willfp.ecobosses.bosses.Bosses
-import com.willfp.ecobosses.events.BossDeathEvent
 import com.willfp.ecobosses.events.BossDespawnEvent
 import com.willfp.ecobosses.events.BossKillEvent
 import com.willfp.ecobosses.events.BossSpawnEvent

eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/spawn/AutospawnHandler.kt

@@ -23,7 +23,7 @@ object AutospawnHandler {
                 val world = location.world ?: continue
 
                 if (plugin.configYml.getBool("autospawn.one-boss-per-world")) {
-                    if (Bosses.getAllAlive().mapNotNull { it.entity }.any { it.world == world }) {
+                    if (Bosses.getAllAlive().map { it.entity }.any { it.world == world }) {
                         continue
                     }
                 }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/tick/ChunkTicker.kt

@@ -11,7 +11,7 @@ class ChunkTicker : BossTicker {
         }
 
         if (currentChunk.isLoaded && currentChunk.isForceLoaded) {
-            return;
+            return
         }
 
         currentChunk.load()

eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/util/LocalCommands.kt

@@ -1,6 +1,5 @@
 package com.willfp.ecobosses.util
 
-import com.willfp.eco.core.config.interfaces.Config
 import com.willfp.eco.util.NumberUtils
 import com.willfp.eco.util.savedDisplayName
 import com.willfp.ecobosses.EcoBossesPlugin
@@ -32,7 +31,7 @@ data class LocalCommands(
         }
 
         for (s in toDispatch) {
-            Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), s);
+            Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), s)
         }
     }
 }

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

@@ -30,7 +30,14 @@ cannot-afford-type:
     sound: "BLOCK_NOTE_BLOCK_PLING"
     pitch: 0.5
 
-point-names: # If you have point names that look ugly (eg g_souls) then you can map them to nice names to be shown to players.
+cannot-afford-price:
+  in-actionbar: true
+  sound:
+    enabled: true
+    sound: "BLOCK_NOTE_BLOCK_PLING"
+    pitch: 0.5
+
+point-names: # If you have point names that look ugly (e.g. souls) then you can map them to nice names to be shown to players.
   example_point: "Nicely Formatted Point"
 
 use-faster-move-trigger: true # Disable if you want move trigger to detect sub-1-block movements

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

@@ -1,9 +1,22 @@
 messages:
   prefix: "&9&lEcoBosses &f» "
   no-permission: "&cYou don't have permission to do this!"
-  invalid-command: "&cUnknown subcommand!"
   not-player: "&cThis command must be run by a player"
+  invalid-command: "&cUnknown subcommand!"
   reloaded: "Reloaded!"
+  cannot-afford: "&cYou can't afford to do this! &fCost: &a$$%cost%"
+  cannot-afford-type: "&cYou can't afford to do this! &fCost: &a%cost% %type%"
+  cannot-afford-price: "&cYou can't afford to do this! &fPrice: %price%"
+  on-cooldown: "&cThis effect is on cooldown! &fTime left: &a%seconds% seconds"
+  cannot-transmit: "&cYou can't transmit here!"
+  must-specify-lrcdb-id: "&cYou must specify the ID of the config to download! Not sure what this means? Go to &alrcdb.auxilor.io"
+  lrcdb-import-error: "&cError importing config: &f%message%"
+  lrcdb-import-success: "&fImported &a%name%&f! Reload the plugin to install it"
+  must-specify-config-name: "&cYou must specify the config name!"
+  invalid-config-name: "&cInvalid config name!"
+  lrcdb-export-error: "&cError exporting config: &f%message%"
+  lrcdb-export-success: "&fExported &a%name%&f! View it on &alrcdb.auxilor.io&f, or share your config ID: &f%id%"
+
   sent-drop: "Check console for the drop!"
   specify-boss: "&cYou must specify a valid boss!"
   invalid-location: "&cInvalid location!"
@@ -15,16 +28,5 @@ messages:
   invalid-stone: "&cInvalid boss!"
   give-success: "Gave &a%boss%&r spawn egg to &a%recipient%"
   requirements-not-met: "&cYou can't spawn this boss!"
-  on-cooldown: "&cThis effect is on cooldown! &fTime left: &a%seconds% seconds"
-  cannot-afford: "&cYou can't afford to do this! &fCost: &a$$%cost%"
-  cannot-afford-type: "&cYou can't afford to do this! &fCost: &a%cost% %type%"
-  cannot-transmit: "&cYou can't transmit here!"
-  must-specify-lrcdb-id: "&cYou must specify the ID of the config to download! Not sure what this means? Go to &alrcdb.auxilor.io"
-  lrcdb-import-error: "&cError importing config: &f%message%"
-  lrcdb-import-success: "&fImported &a%name%&f! Reload the plugin to install it"
-  must-specify-config-name: "&cYou must specify the config name!"
-  invalid-config-name: "&cInvalid config name!"
-  lrcdb-export-error: "&cError exporting config: &f%message%"
-  lrcdb-export-success: "&fExported &a%name%&f! View it on &alrcdb.auxilor.io&f, or share your config ID: &f%id%"
 
 na: "N/A"

gradle.properties

@@ -1,4 +1,4 @@
 #libreforge-updater
-#Wed Oct 19 20:44:41 BST 2022
+#Tue Nov 01 16:23:35 GMT 2022
-version=8.100.0
+version=8.103.0
 plugin-name=EcoBosses