libreforge-updater

build.gradle.kts

@@ -2,7 +2,7 @@ plugins {
     java
     `java-library`
     `maven-publish`
-    kotlin("jvm") version "1.7.10"
+    kotlin("jvm") version "1.9.20"
     id("com.github.johnrengelman.shadow") version "8.0.0"
     id("com.willfp.libreforge-gradle-plugin") version "1.0.0"
 }
@@ -39,7 +39,7 @@ allprojects {
     dependencies {
         compileOnly("com.willfp:eco:6.65.0")
         compileOnly("org.jetbrains:annotations:23.0.0")
-        compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.7.10")
+        compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.9.20")
     }
 
     java {

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/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,7 +283,7 @@ class Quest(
             return
         }
 
-        startEffects?.trigger(player)
+        startEffects?.trigger(player.toDispatcher())
         player.profile.write(hasStartedKey, true)
         player.profile.write(startedTimeKey, currentTimeMinutes)
 
@@ -408,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
@@ -152,7 +153,7 @@ class Task(
 
         if (newXp >= requiredXp) {
             player.profile.write(hasCompletedKey, true)
-            template.onComplete?.trigger(player)
+            template.onComplete?.trigger(player.toDispatcher())
 
             Bukkit.getPluginManager().callEvent(PlayerTaskCompleteEvent(player, template, quest))
 

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

@@ -1,52 +0,0 @@
-name: ${pluginName}
-version: ${version}
-main: com.willfp.ecoquests.EcoQuestsPlugin
-api-version: 1.19
-
-dependencies:
-  - name: eco
-    required: true
-    bootstrap: false
-
-  - name: libreforge
-    required: false
-    bootstrap: false
-
-load-after:
-  - name: eco
-    bootstrap: false
-
-permissions:
-  ecoquests.*:
-    description: All ecoquests permissions
-    default: op
-    children:
-      ecoquests.command.*: true
-  ecoquests.command.*:
-    description: All commands
-    default: op
-    children:
-      ecoquests.command.reload: true
-      ecoquests.command.quests: true
-      ecoquests.command.start: true
-      ecoquests.command.reset: true
-      ecoquests.command.resetplayer: true
-
-  ecoquests.command.reload:
-    description: Allows reloading the config
-    default: op
-  ecoquests.command.ecoquests:
-    description: Allows the use of /ecoquests.
-    default: true
-  ecoquests.command.quests:
-    description: Allows the use of /quests.
-    default: true
-  ecoquests.command.start:
-    description: Allows using /ecoquests start.
-    default: op
-  ecoquests.command.reset:
-    description: Allows using /ecoquests reset.
-    default: op
-  ecoquests.command.resetplayer:
-    description: Allows using /ecoquests resetplayer.
-    default: op

gradle.properties

@@ -1,5 +1,5 @@
 #libreforge-updater
-#Sat Sep 02 17:34:44 BST 2023
+#Thu Jan 04 17:25:37 GMT 2024
 kotlin.code.style=official
-libreforge-version=4.33.2
-version=1.5.1
+libreforge-version=4.53.0
+version=1.24.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