libreforge-updater

FEAT: Add addexp subcommand

.github/workflows/publish-release.yml

@@ -15,11 +15,11 @@ jobs:
       - name: Checkout latest code
         uses: actions/checkout@v2
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v2
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
 
       - name: Change wrapper permissions
         run: chmod +x ./gradlew

build.gradle.kts

@@ -1,9 +1,11 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     java
     `java-library`
     `maven-publish`
-    kotlin("jvm") version "1.7.10"
+    kotlin("jvm") version "2.1.0"
-    id("com.github.johnrengelman.shadow") version "8.0.0"
+    id("com.gradleup.shadow") version "8.3.0"
     id("com.willfp.libreforge-gradle-plugin") version "1.0.0"
 }
 
@@ -25,7 +27,7 @@ allprojects {
     apply(plugin = "java")
     apply(plugin = "kotlin")
     apply(plugin = "maven-publish")
-    apply(plugin = "com.github.johnrengelman.shadow")
+    apply(plugin = "com.gradleup.shadow")
 
     repositories {
         mavenLocal()
@@ -39,12 +41,12 @@ 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:2.1.0")
     }
 
     java {
         withSourcesJar()
-        toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+        toolchain.languageVersion.set(JavaLanguageVersion.of(21))
     }
 
     tasks {
@@ -54,8 +56,8 @@ allprojects {
         }
 
         compileKotlin {
-            kotlinOptions {
+            compilerOptions {
-                jvmTarget = "17"
+                jvmTarget.set(JvmTarget.JVM_21)
             }
         }
 

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

@@ -0,0 +1,83 @@
+package com.willfp.ecoquests.commands
+
+import com.willfp.eco.core.EcoPlugin
+import com.willfp.eco.core.command.impl.PluginCommand
+import com.willfp.eco.core.commands.notifyNull
+import com.willfp.eco.util.StringUtils
+import com.willfp.ecoquests.quests.Quests
+import com.willfp.ecoquests.tasks.Tasks
+import org.bukkit.command.CommandSender
+import org.bukkit.util.StringUtil
+
+class CommandAddExp(plugin: EcoPlugin) : PluginCommand(
+    plugin,
+    "addexp",
+    "ecoquests.command.addexp",
+    false
+) {
+
+    override fun onExecute(sender: CommandSender, args: List<String>) {
+        val player = notifyPlayerRequired(args.getOrNull(0), "invalid-player")
+        val quest = notifyNull(Quests[args.getOrNull(1)], "invalid-quest")
+
+        val taskTemplate = notifyNull(Tasks[args.getOrNull(2)], "invalid-task")
+        val task = notifyNull(quest.getTask(taskTemplate), "invalid-task")
+        if (args.size < 4) {
+            sender.sendMessage(plugin.langYml.getMessage("invalid-exp-value"))
+            return
+        }
+
+        val unparsedValue = args[3].notifyNull("invalid-exp-value")
+        val value: Double
+        try {
+            value = unparsedValue.toDouble()
+        } catch (_: NumberFormatException) {
+            sender.sendMessage(plugin.langYml.getMessage("invalid-exp-value"))
+            return
+        }
+
+        task.gainExperience(player, value)
+
+        sender.sendMessage(
+            plugin.langYml.getMessage("exp-added", StringUtils.FormatOption.WITHOUT_PLACEHOLDERS)
+                .replace("%xp%", value.toString())
+                .replace("%quest%", quest.name)
+                .replace("%task%", task.template.id)
+                .replace("%player%", player.name)
+        )
+    }
+
+    override fun tabComplete(sender: CommandSender, args: List<String>): List<String> {
+        val completions = mutableListOf<String>()
+
+        if (args.size == 1) {
+            StringUtil.copyPartialMatches(
+                args[0],
+                plugin.server.onlinePlayers.map { it.name },
+                completions
+            )
+        }
+
+        if (args.size == 2) {
+            StringUtil.copyPartialMatches(
+                args[1],
+                Quests.values().map { it.id },
+                completions
+            )
+        }
+
+        if (args.size == 3) {
+            val quest = Quests[args[1]]
+            if (quest != null) {
+                StringUtil.copyPartialMatches(
+                    args[2],
+                    quest.tasks.map { it.template.id } ,
+                    completions
+                )
+            }
+        }
+
+        return completions
+    }
+
+}

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

@@ -15,6 +15,7 @@ class CommandEcoQuests(plugin: EcoPlugin) : PluginCommand(
             .addSubcommand(CommandStart(plugin))
             .addSubcommand(CommandResetPlayer(plugin))
             .addSubcommand(CommandReset(plugin))
+            .addSubcommand(CommandAddExp(plugin))
     }
 
     override fun onExecute(sender: CommandSender, args: List<String>) {

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(
@@ -100,12 +101,22 @@ class Quest(
 
     // The tasks that are actually in use
     var tasks = run {
+        if (taskAmount == availableTasks.size) {
+            // If taskAmount is equal to availableTasks.size then tasks are ordered as configured
+            if (isResettable) {
+                availableTasks.take(taskAmount)
+            } else {
+                availableTasks.shuffled().take(taskAmount)
+            }
+        } else {
+            // If taskAmount is less than availableTasks.size then tasks are selected and ordered randomly.
             if (isResettable) {
                 loadTasks() ?: availableTasks.randomlyPick(taskAmount)
             } else {
                 availableTasks.randomlyPick(taskAmount)
             }
         }
+    }
         private set
 
     private val hasStartedKey = PersistentDataKey(
@@ -222,6 +233,28 @@ class Quest(
                     .formatEco(it)
             }
         }.register()
+
+        for (i in 1..this.tasks.size+1) {
+            PlayerPlaceholder(plugin, "quest_${id}_task_${i}_required_xp") {
+                this.tasks[i-1].getExperienceRequired(it).toNiceString()
+            }.register()
+
+            PlayerPlaceholder(plugin, "quest_${id}_task_${i}_xp") {
+                this.tasks[i-1].getExperience(it).toNiceString()
+            }.register()
+
+            PlayerPlaceholder(plugin, "quest_${id}_task_${i}_description") {
+                this.tasks[i-1].getDescription(it)
+            }.register()
+
+            PlayerPlaceholder(plugin, "quest_${id}_task_${i}_completed") {
+                this.tasks[i-1].hasCompleted(it).toNiceString()
+            }.register()
+
+            PlayerPlaceholder(plugin, "quest_${id}_task_${i}_completed_description") {
+                this.tasks[i-1].getCompletedDescription(it)
+            }.register()
+        }
     }
 
     override fun onRegister() {
@@ -245,7 +278,8 @@ class Quest(
     }
 
     fun getDescription(player: Player): List<String> {
-        return addPlaceholdersInto(listOf(config.getString("description")), player)
+        val descriptions = config.getStrings("description")
+        return addPlaceholdersInto(descriptions, player)
     }
 
     fun hasActive(player: OfflinePlayer): Boolean {
@@ -257,7 +291,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 +316,7 @@ class Quest(
             return
         }
 
-        startEffects?.trigger(player)
+        startEffects?.trigger(player.toDispatcher())
         player.profile.write(hasStartedKey, true)
         player.profile.write(startedTimeKey, currentTimeMinutes)
 
@@ -408,7 +442,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
@@ -145,6 +146,11 @@ class Task(
      * Give experience directly
      */
     fun giveExperience(player: Player, amount: Double) {
+
+        if (player.profile.read(hasCompletedKey)) {
+            return
+        }
+
         val requiredXp = getExperienceRequired(player)
         val newXp = player.profile.read(xpKey) + amount
 
@@ -152,7 +158,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/lang.yml

@@ -7,12 +7,15 @@ messages:
 
   invalid-player: "&cInvalid player!"
   invalid-quest: "&cInvalid quest!"
+  invalid-task: "&cInvalid task! Should be exist in quest."
+  invalid-exp-value: "&cInvalid exp value! Should be a double (like 1.0)."
   already-started: "&cThe player has already started this quest!"
 
   started-quest: "&fStarted the &a%quest% &fquest for &a%player%&f!"
   reset-quest-for-player: "&fReset the &a%quest% &fquest for &a%player%&f!"
   reset-quest: "&fReset the &a%quest% &fquest!"
   quest-not-resettable: "&cThis quest is not resettable!"
+  exp-added: "&aAdded &f%xp% &aXP in quest &f%quest%&a, task &f%task%&a for &f%player%&a!"
 
 time-since:
   never: "&cNot started yet!"

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

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

@@ -35,6 +35,7 @@ permissions:
       ecoquests.command.start: true
       ecoquests.command.reset: true
       ecoquests.command.resetplayer: true
+      ecoquests.command.addexp: true
 
   ecoquests.command.reload:
     description: Allows reloading the config
@@ -54,3 +55,6 @@ permissions:
   ecoquests.command.resetplayer:
     description: Allows using /ecoquests resetplayer.
     default: op
+  ecoquests.command.addexp:
+    description: Allows using /ecoquests addexp.
+    default: op

gradle.properties

@@ -1,5 +1,5 @@
 #libreforge-updater
-#Thu Sep 07 16:01:57 BST 2023
+#Mon Oct 06 08:57:19 BST 2025
 kotlin.code.style=official
-libreforge-version=4.33.3
+libreforge-version=4.79.0
-version=1.5.2
+version=1.50.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 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.7-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

jitpack.yml

@@ -1,6 +0,0 @@
-jdk: openjdk17
-before_install:
-  - source "$HOME/.sdkman/bin/sdkman-init.sh"
-  - sdk update
-  - sdk install java 17.0.1-tem
-  - sdk use java 17.0.1-tem

settings.gradle.kts

@@ -2,11 +2,15 @@ pluginManagement {
     repositories {
         gradlePluginPortal()
         mavenLocal()
-        maven("https://repo.jpenilla.xyz/snapshots/")
         maven("https://repo.auxilor.io/repository/maven-public/")
+        maven("https://repo.papermc.io/repository/maven-public/")
     }
 }
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
+
 rootProject.name = "EcoQuests"
 
 // Core