libreforge-updater

FEAT: Add addexp subcommand

build.gradle.kts

@@ -1,9 +1,11 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     java
     `java-library`
     `maven-publish`
-    kotlin("jvm") version "1.9.20"
-    id("io.github.goooler.shadow") version "8.1.7"
+    kotlin("jvm") version "2.1.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 = "io.github.goooler.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.9.20")
+        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 {
-                jvmTarget = "17"
+            compilerOptions {
+                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/quests/Quest.kt

@@ -101,10 +101,20 @@ class Quest(
 
     // The tasks that are actually in use
     var tasks = run {
-        if (isResettable) {
-            loadTasks() ?: availableTasks.randomlyPick(taskAmount)
+        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 {
-            availableTasks.randomlyPick(taskAmount)
+            // 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
@@ -268,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 {

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

@@ -146,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
 

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/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
@@ -53,4 +54,7 @@ permissions:
     default: op
   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
-#Wed Aug 21 18:58:25 BST 2024
+#Mon Oct 06 08:57:19 BST 2025
 kotlin.code.style=official
-libreforge-version=4.71.2
-version=1.42.2
+libreforge-version=4.79.0
+version=1.50.0