libreforge-updater

eco-core/core-plugin/src/main/kotlin/com/willfp/ecoquests/commands/CommandQuests.kt

@@ -3,8 +3,6 @@ package com.willfp.ecoquests.commands
 import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.command.impl.PluginCommand
 import com.willfp.ecoquests.gui.QuestsGUI
-import com.willfp.libreforge.commands.CommandReload
-import org.bukkit.command.CommandSender
 import org.bukkit.entity.Player
 
 class CommandQuests(plugin: EcoPlugin) : PluginCommand(

eco-core/core-plugin/src/main/kotlin/com/willfp/ecoquests/commands/CommandStart.kt

@@ -3,11 +3,8 @@ package com.willfp.ecoquests.commands
 import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.command.impl.PluginCommand
 import com.willfp.eco.util.StringUtils
-import com.willfp.ecoquests.gui.QuestsGUI
 import com.willfp.ecoquests.quests.Quests
-import com.willfp.libreforge.commands.CommandReload
 import org.bukkit.command.CommandSender
-import org.bukkit.entity.Player
 import org.bukkit.util.StringUtil
 
 class CommandStart(plugin: EcoPlugin) : PluginCommand(

eco-core/core-plugin/src/main/kotlin/com/willfp/ecoquests/gui/components/PositionedPageChanger.kt

@@ -12,7 +12,7 @@ class PositionedPageChanger(
     direction: PageChanger.Direction
 ): PositionedComponent {
     private val pageChanger = PageChanger(
-        Items.lookup("item").item,
+        Items.lookup(config.getString("item")).item,
         direction
     )
 

eco-core/core-plugin/src/main/kotlin/com/willfp/ecoquests/libreforge/ConditionHasCompletedQuest.kt

@@ -2,9 +2,12 @@ package com.willfp.ecoquests.libreforge
 
 import com.willfp.eco.core.config.interfaces.Config
 import com.willfp.ecoquests.quests.Quests
+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 ConditionHasCompletedQuest : Condition<NoCompileData>("has_completed_quest") {
@@ -12,7 +15,14 @@ object ConditionHasCompletedQuest : Condition<NoCompileData>("has_completed_ques
         require("quest", "You must specify the quest ID!")
     }
 
-    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
+
         val quest = Quests[config.getString("quest")] ?: return false
 
         return quest.hasCompleted(player)

eco-core/core-plugin/src/main/kotlin/com/willfp/ecoquests/libreforge/ConditionHasCompletedTask.kt

@@ -3,9 +3,12 @@ package com.willfp.ecoquests.libreforge
 import com.willfp.eco.core.config.interfaces.Config
 import com.willfp.ecoquests.quests.Quests
 import com.willfp.ecoquests.tasks.Tasks
+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 ConditionHasCompletedTask : Condition<NoCompileData>("has_completed_task") {
@@ -14,7 +17,14 @@ object ConditionHasCompletedTask : Condition<NoCompileData>("has_completed_task"
         require("task", "You must specify the task ID!")
     }
 
-    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
+
         val quest = Quests[config.getString("quest")] ?: return false
         val template = Tasks[config.getString("task")] ?: return false
         val task = quest.getTask(template) ?: return false

eco-core/core-plugin/src/main/kotlin/com/willfp/ecoquests/libreforge/ConditionHasQuestActive.kt

@@ -2,9 +2,12 @@ package com.willfp.ecoquests.libreforge
 
 import com.willfp.eco.core.config.interfaces.Config
 import com.willfp.ecoquests.quests.Quests
+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 ConditionHasQuestActive : Condition<NoCompileData>("has_quest_active") {
@@ -12,7 +15,14 @@ object ConditionHasQuestActive : Condition<NoCompileData>("has_quest_active") {
         require("quest", "You must specify the quest ID!")
     }
 
-    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
+
         val quest = Quests[config.getString("quest")] ?: return false
 
         return quest.hasActive(player)

eco-core/core-plugin/src/main/kotlin/com/willfp/ecoquests/libreforge/EffectQuestXpMultiplier.kt

@@ -4,6 +4,7 @@ import com.willfp.ecoquests.api.event.PlayerTaskExpGainEvent
 import com.willfp.ecoquests.quests.Quest
 import com.willfp.ecoquests.quests.Quests
 import com.willfp.libreforge.effects.templates.MultiMultiplierEffect
+import com.willfp.libreforge.toDispatcher
 import org.bukkit.event.EventHandler
 
 object EffectQuestXpMultiplier : MultiMultiplierEffect<Quest>("quest_xp_multiplier") {
@@ -19,6 +20,6 @@ object EffectQuestXpMultiplier : MultiMultiplierEffect<Quest>("quest_xp_multipli
 
     @EventHandler(ignoreCancelled = true)
     fun handle(event: PlayerTaskExpGainEvent) {
-        event.amount *= getMultiplier(event.player, event.quest)
+        event.amount *= getMultiplier(event.player.toDispatcher(), event.quest)
     }
 }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecoquests/libreforge/TriggerCompleteQuest.kt

@@ -2,6 +2,7 @@ package com.willfp.ecoquests.libreforge
 
 import com.willfp.ecoquests.api.event.PlayerQuestCompleteEvent
 import com.willfp.ecoquests.api.event.PlayerQuestStartEvent
+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 TriggerCompleteQuest : Trigger("complete_quest") {
         val player = event.player
 
         this.dispatch(
-            player,
+            player.toDispatcher(),
             TriggerData(
                 player = player,
                 event = event

eco-core/core-plugin/src/main/kotlin/com/willfp/ecoquests/libreforge/TriggerCompleteTask.kt

@@ -1,6 +1,7 @@
 package com.willfp.ecoquests.libreforge
 
 import com.willfp.ecoquests.api.event.PlayerTaskCompleteEvent
+import com.willfp.libreforge.toDispatcher
 import com.willfp.libreforge.triggers.Trigger
 import com.willfp.libreforge.triggers.TriggerData
 import com.willfp.libreforge.triggers.TriggerParameter
@@ -17,7 +18,7 @@ object TriggerCompleteTask : Trigger("complete_task") {
         val player = event.player
 
         this.dispatch(
-            player,
+            player.toDispatcher(),
             TriggerData(
                 player = player,
                 event = event

eco-core/core-plugin/src/main/kotlin/com/willfp/ecoquests/libreforge/TriggerGainTaskXp.kt

@@ -1,6 +1,7 @@
 package com.willfp.ecoquests.libreforge
 
 import com.willfp.ecoquests.api.event.PlayerTaskExpGainEvent
+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 TriggerGainTaskXp : Trigger("gain_task_xp") {
         val player = event.player
 
         this.dispatch(
-            player,
+            player.toDispatcher(),
             TriggerData(
                 player = player,
                 event = event,

eco-core/core-plugin/src/main/kotlin/com/willfp/ecoquests/libreforge/TriggerStartQuest.kt

@@ -1,6 +1,7 @@
 package com.willfp.ecoquests.libreforge
 
 import com.willfp.ecoquests.api.event.PlayerQuestStartEvent
+import com.willfp.libreforge.toDispatcher
 import com.willfp.libreforge.triggers.Trigger
 import com.willfp.libreforge.triggers.TriggerData
 import com.willfp.libreforge.triggers.TriggerParameter
@@ -17,7 +18,7 @@ object TriggerStartQuest : Trigger("start_quest") {
         val player = event.player
 
         this.dispatch(
-            player,
+            player.toDispatcher(),
             TriggerData(
                 player = player,
                 event = event

eco-core/core-plugin/src/main/kotlin/com/willfp/ecoquests/quests/Quest.kt

@@ -28,6 +28,7 @@ import com.willfp.libreforge.ViolationContext
 import com.willfp.libreforge.conditions.Conditions
 import com.willfp.libreforge.effects.Effects
 import com.willfp.libreforge.effects.executors.impl.NormalExecutorFactory
+import com.willfp.libreforge.toDispatcher
 import org.bukkit.Bukkit
 import org.bukkit.OfflinePlayer
 import org.bukkit.entity.Player
@@ -58,7 +59,7 @@ class Quest(
             )
 
             addLoreLines(
-                startConditions.getNotMetLines(player, EmptyProvidedHolder)
+                startConditions.getNotMetLines(player.toDispatcher(), EmptyProvidedHolder)
             )
 
             setDisplayName(
@@ -257,7 +258,7 @@ class Quest(
     }
 
     fun meetsStartConditions(player: Player): Boolean {
-        return startConditions.areMet(player, EmptyProvidedHolder)
+        return startConditions.areMet(player.toDispatcher(), EmptyProvidedHolder)
     }
 
     fun shouldStart(player: Player): Boolean {
@@ -282,10 +283,15 @@ class Quest(
             return
         }
 
-        startEffects?.trigger(player)
+        startEffects?.trigger(player.toDispatcher())
         player.profile.write(hasStartedKey, true)
         player.profile.write(startedTimeKey, currentTimeMinutes)
 
+        // Reset tasks to generate new xp requirements
+        for (task in tasks) {
+            task.reset(player)
+        }
+
         Bukkit.getPluginManager().callEvent(PlayerQuestStartEvent(player, this))
     }
 
@@ -403,7 +409,7 @@ class Quest(
     private fun complete(player: Player) {
         player.profile.write(hasCompletedKey, true)
         player.profile.write(completedTimeKey, currentTimeMinutes)
-        rewards?.trigger(player)
+        rewards?.trigger(player.toDispatcher())
 
         Bukkit.getPluginManager().callEvent(PlayerQuestCompleteEvent(player, this))
     }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecoquests/tasks/Task.kt

@@ -15,6 +15,7 @@ import com.willfp.ecoquests.api.event.PlayerTaskExpGainEvent
 import com.willfp.ecoquests.quests.Quest
 import com.willfp.ecoquests.quests.Quests
 import com.willfp.libreforge.counters.Accumulator
+import com.willfp.libreforge.toDispatcher
 import org.bukkit.Bukkit
 import org.bukkit.OfflinePlayer
 import org.bukkit.entity.Player
@@ -32,6 +33,12 @@ class Task(
         0.0
     )
 
+    private val xpRequiredKey = PersistentDataKey(
+        plugin.createNamespacedKey("${quest.id}_task_${template.id}_xp_required"),
+        PersistentDataKeyType.DOUBLE,
+        0.0
+    )
+
     private val hasCompletedKey = PersistentDataKey(
         plugin.createNamespacedKey("${quest.id}_task_${template.id}_has_completed"),
         PersistentDataKeyType.BOOLEAN,
@@ -89,7 +96,7 @@ class Task(
         return player.profile.read(hasCompletedKey)
     }
 
-    fun getExperienceRequired(player: Player): Double {
+    private fun generateExperienceRequired(player: Player): Double {
         return evaluateExpression(
             xpExpr,
             placeholderContext(
@@ -98,6 +105,24 @@ class Task(
         )
     }
 
+    fun getExperienceRequired(player: Player): Double {
+        val required = player.profile.read(xpRequiredKey)
+
+        return if (required <= 0) {
+            val newRequired = generateExperienceRequired(player)
+
+            if (newRequired <= 0) {
+                throw IllegalStateException("Invalid XP Required for task ${template.id} in quest ${quest.id}" +
+                        "(Requirement was $newRequired, which is less than or equal to 0)")
+            }
+
+            player.profile.write(xpRequiredKey, newRequired)
+            newRequired
+        } else {
+            required
+        }
+    }
+
     fun getExperience(player: OfflinePlayer): Double {
         return player.profile.read(xpKey)
     }
@@ -128,6 +153,7 @@ class Task(
 
         if (newXp >= requiredXp) {
             player.profile.write(hasCompletedKey, true)
+            template.onComplete?.trigger(player.toDispatcher())
 
             Bukkit.getPluginManager().callEvent(PlayerTaskCompleteEvent(player, template, quest))
 

eco-core/core-plugin/src/main/kotlin/com/willfp/ecoquests/tasks/TaskTemplate.kt

@@ -6,6 +6,7 @@ import com.willfp.eco.core.registry.KRegistrable
 import com.willfp.ecoquests.quests.Quest
 import com.willfp.libreforge.ViolationContext
 import com.willfp.libreforge.counters.Counters
+import com.willfp.libreforge.effects.Effects
 
 class TaskTemplate(
     private val plugin: EcoPlugin,
@@ -16,6 +17,11 @@ class TaskTemplate(
         Counters.compile(it, ViolationContext(plugin, "task $id tasks"))
     }
 
+    val onComplete = Effects.compileChain(
+        config.getSubsections("on-complete"),
+        ViolationContext(plugin, "task $id on-complete")
+    )
+
     fun create(quest: Quest, xpExpr: String) =
         Task(plugin, this, quest, xpExpr)
 }

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

@@ -3,6 +3,11 @@
 # by Auxilor
 #
 
+# Even if eco is set up to use a database, you can
+# force EcoQuests to save to local storage to disable
+# cross-server sync.
+use-local-storage: false
+
 scan-interval: 20 # How often to scan for quests auto-starting (in ticks)
 
 gui:

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

@@ -21,3 +21,10 @@ xp-gain-methods:
     filters:
       blocks:
         - stone
+
+# An optional list of effects to run when a player completes the task
+# Read here: https://plugins.auxilor.io/effects/configuring-an-effect
+on-complete:
+  - id: send_message
+    args:
+      message: "Task Completed!"

gradle.properties

@@ -1,5 +1,5 @@
 #libreforge-updater
-#Wed Aug 23 15:31:59 BST 2023
+#Thu Nov 30 14:27:46 GMT 2023
 kotlin.code.style=official
-libreforge-version=4.29.2
+libreforge-version=4.47.0
-version=1.2.2
+version=1.19.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists