Merge remote-tracking branch 'template/next' into next

Author: Motzkiste

build.gradle.kts

@@ -27,7 +27,7 @@ subprojects {
 
   dependencies {
     val tools: Project? = findProject(":tools")
-    if (tools != null && tools != project) implementation(project(":tools"))
+    if (tools != null && tools != project) implementation(project(path = ":tools", configuration = "shadow"))
 
     compileOnly(rootProject.libs.kotlin.gradleplugin)
     compileOnly(rootProject.libs.kotlin.stdlib)
@@ -121,17 +121,15 @@ subprojects {
   }
 }
 
-fun getAsYamlList(commaSeparatedList: Any?): String {
+fun getAsYamlList(commaSeparatedList: Any?): String =
   if (commaSeparatedList is String && commaSeparatedList.isNotBlank()) {
-    return commaSeparatedList
+    commaSeparatedList
       .replace(" ", "")
       .split(",")
       .stream()
       .map { "\n  - $it" }
       .collect(Collectors.joining())
-  }
-  return ""
-}
+  } else ""
 
 repositories {
   bitBuildArtifactory()

gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
-kotlin = "1.8.20"
+kotlin = "1.8.21"
 shadow = "8.1.1"
-run = "2.0.1"
+run = "2.1.0"
 
 # Minecraft Software
 spigot = "1.19.4-R0.1-SNAPSHOT"

gradle/module-resources/folia.kts

@@ -1,11 +1,13 @@
 plugins {
-//  alias(libs.plugins.run.paper)
+    alias(libs.plugins.run.paper)
 }
 
 dependencies {
   compileOnly(libs.minecraft.server.folia)
 }
 
-//tasks.runServer {
-//  minecraftVersion("1.19.4")
-//}
+tasks {
+    runPaper.folia.registerTask {
+        minecraftVersion("1.19.4")
+    }
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists