libreforge-updater

improved sorting and multi-line descriptions

.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

@@ -3,7 +3,7 @@ plugins {
     `java-library`
     `maven-publish`
     kotlin("jvm") version "1.9.20"
-    id("com.github.johnrengelman.shadow") version "8.0.0"
+    id("io.github.goooler.shadow") version "8.1.7"
     id("com.willfp.libreforge-gradle-plugin") version "1.0.0"
 }
 
@@ -25,7 +25,7 @@ allprojects {
     apply(plugin = "java")
     apply(plugin = "kotlin")
     apply(plugin = "maven-publish")
-    apply(plugin = "com.github.johnrengelman.shadow")
+    apply(plugin = "io.github.goooler.shadow")
 
     repositories {
         mavenLocal()

eco-core/core-plugin/src/main/kotlin/com/willfp/ecoquests/quests/Quest.kt

@@ -101,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(
@@ -223,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() {
@@ -246,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
-#Tue Jan 16 13:29:19 GMT 2024
+#Sun Sep 22 17:00:59 BST 2024
 kotlin.code.style=official
-libreforge-version=4.55.1
+libreforge-version=4.72.0
-version=1.26.1
+version=1.43.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.3-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