Fix commented sections of server build

This commit is contained in:
Jason Penilla
2024-12-07 20:20:50 -07:00
committed by Nassim Jahnke
parent d23702f449
commit 48c0f0ecd6

View File

@@ -133,8 +133,6 @@ dependencies {
tasks.jar { tasks.jar {
archiveClassifier.set("dev")
manifest { manifest {
val git = Git(rootProject.layout.projectDirectory.path) val git = Git(rootProject.layout.projectDirectory.path)
val mcVersion = rootProject.providers.gradleProperty("mcVersion").get() val mcVersion = rootProject.providers.gradleProperty("mcVersion").get()
@@ -176,27 +174,27 @@ publishing {
} }
// Paper start // Paper start
// val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.ScanJarForBadCalls::class) { val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.ScanJarForBadCalls::class) {
// badAnnotations.add("Lio/papermc/paper/annotation/DoNotUse;") badAnnotations.add("Lio/papermc/paper/annotation/DoNotUse;")
// jarToScan.set(tasks.serverJar.flatMap { it.archiveFile }) jarToScan.set(tasks.jar.flatMap { it.archiveFile })
// classpath.from(configurations.compileClasspath) classpath.from(configurations.compileClasspath)
// } }
// tasks.check { tasks.check {
// dependsOn(scanJar) dependsOn(scanJar)
// } }
// Paper end // Paper end
// Paper start - use TCA for console improvements // Paper start - use TCA for console improvements
// tasks.serverJar { tasks.jar {
// from(alsoShade.elements.map { from(alsoShade.elements.map {
// it.map { f -> it.map { f ->
// if (f.asFile.isFile) { if (f.asFile.isFile) {
// zipTree(f.asFile) zipTree(f.asFile)
// } else { } else {
// f.asFile f.asFile
// } }
// } }
// }) })
// } }
// Paper end - use TCA for console improvements // Paper end - use TCA for console improvements
tasks.test { tasks.test {
@@ -253,22 +251,17 @@ fun TaskContainer.registerRunTask(
block(this) block(this)
} }
// val runtimeClasspathWithoutVanillaServer = configurations.runtimeClasspath.flatMap { it.elements } tasks.registerRunTask("runServer") {
// .zip(configurations.vanillaServer.map { it.singleFile.absolutePath }) { runtime, vanilla -> description = "Spin up a test server from the Mojang mapped server jar"
// runtime.filterNot { it.asFile.absolutePath == vanilla } classpath(tasks.includeMappings.flatMap { it.outputJar })
// } classpath(configurations.runtimeClasspath)
// }
// tasks.registerRunTask("runServer") {
// description = "Spin up a test server from the Mojang mapped server jar" tasks.registerRunTask("runReobfServer") {
// classpath(tasks.includeMappings.flatMap { it.outputJar }) description = "Spin up a test server from the reobfJar output jar"
// classpath(runtimeClasspathWithoutVanillaServer) classpath(tasks.reobfJar.flatMap { it.outputJar })
// } classpath(configurations.runtimeClasspath)
// }
// tasks.registerRunTask("runReobfServer") {
// description = "Spin up a test server from the reobfJar output jar"
// classpath(tasks.reobfJar.flatMap { it.outputJar })
// classpath(runtimeClasspathWithoutVanillaServer)
// }
tasks.registerRunTask("runDevServer") { tasks.registerRunTask("runDevServer") {
description = "Spin up a test server without assembling a jar" description = "Spin up a test server without assembling a jar"
@@ -281,18 +274,18 @@ tasks.registerRunTask("runBundler") {
classpath(tasks.named<io.papermc.paperweight.tasks.CreateBundlerJar>("createMojmapBundlerJar").flatMap { it.outputZip }) classpath(tasks.named<io.papermc.paperweight.tasks.CreateBundlerJar>("createMojmapBundlerJar").flatMap { it.outputZip })
mainClass.set(null as String?) mainClass.set(null as String?)
} }
// tasks.registerRunTask("runReobfBundler") { tasks.registerRunTask("runReobfBundler") {
// description = "Spin up a test server from the reobf bundler jar" description = "Spin up a test server from the reobf bundler jar"
// classpath(rootProject.tasks.named<io.papermc.paperweight.tasks.CreateBundlerJar>("createReobfBundlerJar").flatMap { it.outputZip }) classpath(rootProject.tasks.named<io.papermc.paperweight.tasks.CreateBundlerJar>("createReobfBundlerJar").flatMap { it.outputZip })
// mainClass.set(null as String?) mainClass.set(null as String?)
// } }
tasks.registerRunTask("runPaperclip") { tasks.registerRunTask("runPaperclip") {
description = "Spin up a test server from the Mojang mapped Paperclip jar" description = "Spin up a test server from the Mojang mapped Paperclip jar"
classpath(tasks.named<io.papermc.paperweight.tasks.CreatePaperclipJar>("createMojmapPaperclipJar").flatMap { it.outputZip }) classpath(tasks.named<io.papermc.paperweight.tasks.CreatePaperclipJar>("createMojmapPaperclipJar").flatMap { it.outputZip })
mainClass.set(null as String?) mainClass.set(null as String?)
} }
// tasks.registerRunTask("runReobfPaperclip") { tasks.registerRunTask("runReobfPaperclip") {
// description = "Spin up a test server from the reobf Paperclip jar" description = "Spin up a test server from the reobf Paperclip jar"
// classpath(rootProject.tasks.named<io.papermc.paperweight.tasks.CreatePaperclipJar>("createReobfPaperclipJar").flatMap { it.outputZip }) classpath(rootProject.tasks.named<io.papermc.paperweight.tasks.CreatePaperclipJar>("createReobfPaperclipJar").flatMap { it.outputZip })
// mainClass.set(null as String?) mainClass.set(null as String?)
// } }