Properly name fork bundler/paperclip jars

Author: jpenilla

paperweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/BundlerJarTasks.kt

@@ -99,25 +99,27 @@ class BundlerJarTasks(
             mainClass.set(mainClassString)
             extraManifestMainAttributes.convention(mapOf("Enable-Native-Access" to "ALL-UNNAMED"))
 
-            outputZip.set(layout.buildDirectory.file("libs/${rootProject.jarName("bundler", classifier)}"))
+            outputZip.set(layout.buildDirectory.file(jarName("bundler", classifier).map { "libs/$it" }))
         }
         val paperclipJarTask = tasks.register<CreatePaperclipJar>(paperclipTaskName) {
             group = "bundling"
             description = "Build a runnable paperclip jar"
 
             libraryChangesJson.set(bundlerJarTask.flatMap { it.libraryChangesJson })
-            outputZip.set(layout.buildDirectory.file("libs/${rootProject.jarName("paperclip", classifier)}"))
+            outputZip.set(layout.buildDirectory.file(jarName("paperclip", classifier).map { "libs/$it" }))
         }
         return bundlerJarTask to paperclipJarTask
     }
 
-    private fun Project.jarName(kind: String, classifier: String): String {
-        return listOfNotNull(
-            project.name,
-            kind,
-            project.version,
-            classifier.takeIf { it.isNotBlank() },
-        ).joinToString("-") + ".jar"
+    private fun Project.jarName(kind: String, classifier: String): Provider<String> {
+        return bundlerJarName.map {
+            listOfNotNull(
+                it,
+                kind,
+                project.version,
+                classifier.takeIf { c -> c.isNotBlank() },
+            ).joinToString("-") + ".jar"
+        }
     }
 
     private fun TaskProvider<CreateBundlerJar>.configureWith(

paperweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/SoftSpoonTasks.kt

@@ -299,6 +299,9 @@ class SoftSpoonTasks(
             )
 
             if (activeFork) {
+                // setup output name conventions
+                project.coreExt.bundlerJarName.convention(cfg.name)
+
                 // setup aggregate -server patching tasks
                 upstreamConfigTasks.setupAggregateTasks(
                     "Server",