Release 1.8.1

.github/workflows/e2e.yml

@@ -61,9 +61,6 @@ jobs:
           # (mineflayer/minecraft-data must support the target Minecraft version).
           key: e2e-npm-${{ hashFiles('e2e/src/test/e2e/package-lock.json') }}
 
-      - name: Build Challenges jar (Maven)
-        run: mvn -B -DskipTests package
-
       - name: Run E2E tests
         working-directory: e2e
         env:

.github/workflows/publish.yml

@@ -18,7 +18,7 @@ on:
 
 jobs:
   publish:
-    uses: bentoboxworld/.github/.github/workflows/publish-platforms.yml@ca2dcd167e8db4e0f671a976080744dda43801a6 # master
+    uses: bentoboxworld/.github/.github/workflows/publish-platforms.yml@1f91a0edf72e8c86d671b3b8fdd3121ac6fb88e1 # master
     with:
       use_release_asset: "true"          # publish the jar attached to the release; do not rebuild
       hangar_slug: "Challenges-For-BentoBox"           # blank = skip Hangar

.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,4 @@
+wrapperVersion=3.3.4
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip
+distributionSha256Sum=305773a68d6ddfd413df58c82b3f8050e89778e777f3a745c8e5b8cbea4018ef

README.md

@@ -4,8 +4,6 @@
 
 Add-on for BentoBox to provide challenges for any BentoBox GameMode. Challenges can be to collect items, to have items or blocks nearby, to amass an amount of money or island levels, or to have accomplished some player statistic. Each challenge can reward the player with money, experience points, blocks, items, or other things, like permissions, Pre-built challenges are available and there is also a Web Library of pre-built ones. Customize them to fit your needs!
 
-![Challenges](https://github.com/BentoBoxWorld/Challenges/assets/4407265/9b3c5278-3a9d-45f2-9ee1-2c1fc1199a8d)
-
 ## How to use
 
 1. Place the addon jar in the addons folder of the BentoBox plugin

e2e/build.gradle.kts

@@ -1,8 +1,10 @@
 import java.net.URI
+import me.drownek.plugwright.PlugwrightTestTask
 
 plugins {
     // Plugwright: boots a real Paper server, deploys plugins, drives Mineflayer bots.
     id("io.github.drownek.plugwright") version "2.0.2"
+    id("java-base")
 }
 
 // --- Dependency jars -------------------------------------------------------------------------
@@ -31,15 +33,62 @@ val bskyblockJar = cachedJar(
     "https://github.com/BentoBoxWorld/BSkyBlock/releases/download/1.20.0/BSkyBlock-1.20.0.jar"
 )
 
-// Maven-built Challenges jar (version/profile suffix varies: -SNAPSHOT-LOCAL locally, plain on CI).
-val challengesJar: File = (file("../target").listFiles()?.toList() ?: emptyList())
-    .firstOrNull {
-        it.name.startsWith("Challenges-") && it.name.endsWith(".jar") &&
-            !it.name.contains("sources") && !it.name.contains("javadoc")
+// If Gradle is running on Java 17, try to find a Java 21+ toolchain to satisfy Maven/Paper.
+// If Gradle is already running on Java 21+ (e.g., 22, 23), don't force a strict toolchain lock.
+val currentJava = JavaVersion.current()
+val javaLauncherProvider = if (currentJava < JavaVersion.VERSION_21) {
+    extensions.getByType<JavaToolchainService>().launcherFor {
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
-    ?: throw GradleException(
-        "Challenges jar not found in ../target — run 'mvn -q -DskipTests package' first."
-    )
+} else {
+    null
+}
+
+val buildChallenges = tasks.register<Exec>("buildChallenges") {
+    workingDir = file("..")
+
+    inputs.dir(file("../src"))
+    inputs.file(file("../pom.xml"))
+    // The wrapper pins the Maven version, so a bump there has to retrigger the build too.
+    inputs.dir(file("../.mvn"))
+    inputs.file(file("../mvnw"))
+
+    val isWindows = System.getProperty("os.name").lowercase().contains("win")
+    val executable = if (isWindows) listOf("cmd", "/c", "mvnw.cmd") else listOf("./mvnw")
+    commandLine(executable + listOf("-q", "package", "-DskipTests"))
+
+    // Pass the correct JAVA_HOME to Maven if we needed a custom toolchain
+    if (javaLauncherProvider != null) {
+        environment["JAVA_HOME"] = javaLauncherProvider.get().metadata.installationPath.asFile.absolutePath
+    } else {
+        environment["JAVA_HOME"] = System.getProperty("java.home")
+    }
+
+    // Explicitly define the expected output file
+    val outputJar = layout.buildDirectory.file("Challenges.jar")
+    outputs.file(outputJar)
+
+    doFirst {
+        logger.lifecycle("Building Challenges project using Maven Wrapper (mvnw package)...")
+    }
+
+    doLast {
+        val builtJar = fileTree("../target") {
+            include("Challenges-*.jar")
+            exclude("*sources*", "*javadoc*")
+        }.files.maxByOrNull { it.lastModified() } 
+            ?: throw GradleException("No Challenges jar found in target/")
+
+        builtJar.copyTo(outputJar.get().asFile, overwrite = true)
+    }
+}
+
+tasks.named<PlugwrightTestTask>("plugwrightTest") {
+    dependsOn(buildChallenges)
+    if (javaLauncherProvider != null) {
+        javaLauncher.set(javaLauncherProvider)
+    }
+}
 
 plugwright {
     minecraftVersion.set("1.21.11")
@@ -52,6 +101,6 @@ plugwright {
     writeFiles {
         file("plugins/BentoBox.jar", bentoboxJar)
         file("plugins/BentoBox/addons/BSkyBlock.jar", bskyblockJar)
-        file("plugins/BentoBox/addons/Challenges.jar", challengesJar)
+        file("plugins/BentoBox/addons/Challenges.jar", file("build/Challenges.jar"))
     }
 }

e2e/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,10 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionSha256Sum=84fbba45c7f4c64abc77460e1c00f541e9f960e3c7ed2538f1ede19eacd873ae
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists