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/quests/Quest.kt

@@ -286,6 +286,11 @@ class Quest(
         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))
     }
 

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

@@ -32,6 +32,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 +95,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 +104,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 +152,7 @@ class Task(
 
         if (newXp >= requiredXp) {
             player.profile.write(hasCompletedKey, true)
+            template.onComplete?.trigger(player)
 
             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
-#Sat Aug 19 15:32:52 BST 2023
+#Mon Oct 30 13:31:07 GMT 2023
 kotlin.code.style=official
-libreforge-version=4.29.1
+libreforge-version=4.39.0
-version=1.2.1
+version=1.11.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