--- a/paper-server/build.gradle.kts +++ b/paper-server/build.gradle.kts @@ -13,6 +_,7 @@ } val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/" +val serverBrand = rootProject.name dependencies { mache("io.papermc:mache:1.21.5+build.2") @@ -24,6 +_,17 @@ minecraftVersion = providers.gradleProperty("mcVersion") gitFilePatches = false + val fork = forks.register(serverBrand) { + upstream.patchDir("paperServer") { + upstreamPath = "paper-server" + excludes = setOf("src/minecraft", "patches", "build.gradle.kts") + patchesDir = rootDirectory.dir("$serverBrand-server/paper-patches") + outputDir = rootDirectory.dir("paper-server") + } + } + + activeFork = fork + //updatingMinecraft { // oldPaperCommit = "f4f275519f7c1fbe9db173b7144a4fe81440e365" //} @@ -108,7 +_,20 @@ } } -val log4jPlugins = sourceSets.create("log4jPlugins") +sourceSets { + main { + java { srcDir("../paper-server/src/main/java") } + resources { srcDir("../paper-server/src/main/resources") } + } + test { + java { srcDir("../paper-server/src/test/java") } + resources { srcDir("../paper-server/src/test/resources") } + } +} + +val log4jPlugins = sourceSets.create("log4jPlugins") { + java { srcDir("../paper-server/src/log4jPlugins/java") } +} configurations.named(log4jPlugins.compileClasspathConfigurationName) { extendsFrom(configurations.compileClasspath.get()) } @@ -130,7 +_,7 @@ } dependencies { - implementation(project(":paper-api")) + implementation(project(":$serverBrand-api")) implementation("ca.spottedleaf:concurrentutil:0.0.3") implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+ implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21 @@ -213,7 +_,7 @@ "Specification-Version" to project.version, "Specification-Vendor" to "Paper Team", "Brand-Id" to "papermc:paper", - "Brand-Name" to "Paper", + "Brand-Name" to serverBrand, "Build-Number" to (build ?: ""), "Build-Time" to buildTime.toString(), "Git-Branch" to gitBranch, @@ -267,7 +_,7 @@ jvmArgumentProviders.add(provider) } -val generatedDir: java.nio.file.Path = layout.projectDirectory.dir("src/generated/java").asFile.toPath() +val generatedDir: java.nio.file.Path = rootProject.layout.projectDirectory.dir("paper-server/src/generated/java").asFile.toPath() idea { module { generatedSourceDirs.add(generatedDir.toFile())