libreforge-updater

eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/EcoJobsPlugin.kt

@@ -30,7 +30,9 @@ import com.willfp.libreforge.filters.Filters
 import com.willfp.libreforge.loader.LibreforgePlugin
 import com.willfp.libreforge.loader.configs.ConfigCategory
 import com.willfp.libreforge.registerHolderProvider
+import com.willfp.libreforge.registerSpecificHolderProvider
 import com.willfp.libreforge.triggers.Triggers
+import org.bukkit.entity.Player
 import org.bukkit.event.Listener
 import java.util.regex.Pattern
 
@@ -56,7 +58,7 @@ class EcoJobsPlugin : LibreforgePlugin() {
         Triggers.register(TriggerLeaveJob)
         Filters.register(FilterJob)
         
-        registerHolderProvider { player ->
+        registerSpecificHolderProvider<Player> { player ->
             player.activeJobs.map { it.getLevel(player.getJobLevel(it)) }.map {
                 SimpleProvidedHolder(it)
             }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/JobLevelGUI.kt

@@ -13,6 +13,7 @@ import com.willfp.eco.core.gui.slot.MaskItems
 import com.willfp.eco.core.items.Items
 import com.willfp.eco.core.items.builder.ItemStackBuilder
 import com.willfp.eco.util.NumberUtils
+import com.willfp.eco.util.formatEco
 import com.willfp.ecojobs.api.getJobLevel
 import com.willfp.ecomponent.components.LevelComponent
 import com.willfp.ecomponent.components.LevelState
@@ -65,7 +66,9 @@ class JobLevelGUI(
         }
 
         menu = menu(plugin.configYml.getInt("level-gui.rows")) {
-            title = job.name
+            title = plugin.configYml.getString("level-gui.title")
+                .replace("%job%", job.name)
+                .formatEco()
 
             maxPages(component.pages)
 

eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/libreforge/ConditionHasActiveJob.kt

@@ -2,9 +2,12 @@ package com.willfp.ecojobs.libreforge
 
 import com.willfp.eco.core.config.interfaces.Config
 import com.willfp.ecojobs.api.activeJobs
+import com.willfp.libreforge.Dispatcher
 import com.willfp.libreforge.NoCompileData
+import com.willfp.libreforge.ProvidedHolder
 import com.willfp.libreforge.arguments
 import com.willfp.libreforge.conditions.Condition
+import com.willfp.libreforge.get
 import org.bukkit.entity.Player
 
 object ConditionHasActiveJob : Condition<NoCompileData>("has_active_job") {
@@ -12,7 +15,14 @@ object ConditionHasActiveJob : Condition<NoCompileData>("has_active_job") {
         require("job", "You must specify the job!")
     }
 
-    override fun isMet(player: Player, config: Config, compileData: NoCompileData): Boolean {
+    override fun isMet(
+        dispatcher: Dispatcher<*>,
+        config: Config,
+        holder: ProvidedHolder,
+        compileData: NoCompileData
+    ): Boolean {
+        val player = dispatcher.get<Player>() ?: return false
+
         return player.activeJobs.any { it.id == config.getString("job").lowercase() }
     }
 }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/libreforge/ConditionHasJobLevel.kt

@@ -4,9 +4,13 @@ import com.willfp.eco.core.config.interfaces.Config
 import com.willfp.ecojobs.api.event.PlayerJobLevelUpEvent
 import com.willfp.ecojobs.api.getJobLevel
 import com.willfp.ecojobs.jobs.Jobs
+import com.willfp.libreforge.Dispatcher
 import com.willfp.libreforge.NoCompileData
+import com.willfp.libreforge.ProvidedHolder
 import com.willfp.libreforge.arguments
 import com.willfp.libreforge.conditions.Condition
+import com.willfp.libreforge.get
+import com.willfp.libreforge.toDispatcher
 import com.willfp.libreforge.updateEffects
 import org.bukkit.entity.Player
 import org.bukkit.event.EventHandler
@@ -18,7 +22,14 @@ object ConditionHasJobLevel : Condition<NoCompileData>("has_job_level") {
         require("level", "You must specify the level!")
     }
 
-    override fun isMet(player: Player, config: Config, compileData: NoCompileData): Boolean {
+    override fun isMet(
+        dispatcher: Dispatcher<*>,
+        config: Config,
+        holder: ProvidedHolder,
+        compileData: NoCompileData
+    ): Boolean {
+        val player = dispatcher.get<Player>() ?: return false
+
         return player.getJobLevel(
             Jobs.getByID(config.getString("job").lowercase()) ?: return false
         ) >= config.getIntFromExpression("level", player)
@@ -26,6 +37,6 @@ object ConditionHasJobLevel : Condition<NoCompileData>("has_job_level") {
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     fun handle(event: PlayerJobLevelUpEvent) {
-        event.player.updateEffects()
+        event.player.toDispatcher().updateEffects()
     }
 }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/libreforge/EffectJobXpMultiplier.kt

@@ -4,6 +4,7 @@ import com.willfp.ecojobs.api.event.PlayerJobExpGainEvent
 import com.willfp.ecojobs.jobs.Job
 import com.willfp.ecojobs.jobs.Jobs
 import com.willfp.libreforge.effects.templates.MultiMultiplierEffect
+import com.willfp.libreforge.toDispatcher
 import org.bukkit.event.EventHandler
 
 object EffectJobXpMultiplier : MultiMultiplierEffect<Job>("job_xp_multiplier") {
@@ -19,6 +20,6 @@ object EffectJobXpMultiplier : MultiMultiplierEffect<Job>("job_xp_multiplier") {
 
     @EventHandler(ignoreCancelled = true)
     fun handle(event: PlayerJobExpGainEvent) {
-        event.amount *= getMultiplier(event.player, event.job)
+        event.amount *= getMultiplier(event.player.toDispatcher(), event.job)
     }
 }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/libreforge/TriggerGainJobXp.kt

@@ -1,6 +1,7 @@
 package com.willfp.ecojobs.libreforge
 
 import com.willfp.ecojobs.api.event.PlayerJobExpGainEvent
+import com.willfp.libreforge.toDispatcher
 import com.willfp.libreforge.triggers.Trigger
 import com.willfp.libreforge.triggers.TriggerData
 import com.willfp.libreforge.triggers.TriggerParameter
@@ -18,7 +19,7 @@ object TriggerGainJobXp : Trigger("gain_job_xp") {
         val player = event.player
 
         this.dispatch(
-            player,
+            player.toDispatcher(),
             TriggerData(
                 player = player,
                 location = player.location,

eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/libreforge/TriggerJoinJob.kt

@@ -2,6 +2,7 @@ package com.willfp.ecojobs.libreforge
 
 import com.willfp.ecojobs.api.event.PlayerJobJoinEvent
 import com.willfp.ecojobs.api.getJobLevel
+import com.willfp.libreforge.toDispatcher
 import com.willfp.libreforge.triggers.Trigger
 import com.willfp.libreforge.triggers.TriggerData
 import com.willfp.libreforge.triggers.TriggerParameter
@@ -20,7 +21,7 @@ object TriggerJoinJob : Trigger("join_job") {
         val player = event.player as? Player ?: return
 
         this.dispatch(
-            player,
+            player.toDispatcher(),
             TriggerData(
                 player = player,
                 location = player.location,

eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/libreforge/TriggerLeaveJob.kt

@@ -2,6 +2,7 @@ package com.willfp.ecojobs.libreforge
 
 import com.willfp.ecojobs.api.event.PlayerJobLeaveEvent
 import com.willfp.ecojobs.api.getJobLevel
+import com.willfp.libreforge.toDispatcher
 import com.willfp.libreforge.triggers.Trigger
 import com.willfp.libreforge.triggers.TriggerData
 import com.willfp.libreforge.triggers.TriggerParameter
@@ -19,7 +20,7 @@ object TriggerLeaveJob : Trigger("leave_job") {
         val player = event.player as? Player ?: return
 
         this.dispatch(
-            player,
+            player.toDispatcher(),
             TriggerData(
                 player = player,
                 location = player.location,

eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/libreforge/TriggerLevelUpJob.kt

@@ -1,6 +1,7 @@
 package com.willfp.ecojobs.libreforge
 
 import com.willfp.ecojobs.api.event.PlayerJobLevelUpEvent
+import com.willfp.libreforge.toDispatcher
 import com.willfp.libreforge.triggers.Trigger
 import com.willfp.libreforge.triggers.TriggerData
 import com.willfp.libreforge.triggers.TriggerParameter
@@ -18,7 +19,7 @@ object TriggerLevelUpJob : Trigger("level_up_job") {
         val player = event.player
 
         this.dispatch(
-            player,
+            player.toDispatcher(),
             TriggerData(
                 player = player,
                 location = player.location,

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

@@ -124,6 +124,7 @@ gui:
 
 level-gui:
   rows: 6
+  title: "%job%"
 
   mask:
     # The way the mask works is by having a list of materials

gradle.properties

@@ -1,5 +1,5 @@
 #libreforge-updater
-#Sat Sep 02 17:34:33 BST 2023
+#Sun Nov 26 23:23:30 GMT 2023
 kotlin.code.style=official
-libreforge-version=4.33.2
+libreforge-version=4.46.0
-version=3.32.1
+version=3.45.0