libreforge-updater

improved sorting and multi-line descriptions

build.gradle.kts

@@ -44,7 +44,7 @@ allprojects {
 
     java {
         withSourcesJar()
-        toolchain.languageVersion.set(JavaLanguageVersion.of(21))
+        toolchain.languageVersion.set(JavaLanguageVersion.of(17))
     }
 
     tasks {
@@ -55,7 +55,7 @@ allprojects {
 
         compileKotlin {
             kotlinOptions {
-                jvmTarget = "21"
+                jvmTarget = "17"
             }
         }
 

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) {
+        if (taskAmount == availableTasks.size) {
-            loadTasks() ?: availableTasks.randomlyPick(taskAmount)
+            // 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 {

gradle.properties

@@ -1,5 +1,5 @@
 #libreforge-updater
-#Fri Jul 05 13:02:51 BST 2024
+#Sun Sep 22 17:00:59 BST 2024
 kotlin.code.style=official
-libreforge-version=4.64.1
+libreforge-version=4.72.0
-version=1.35.1
+version=1.43.0