mirror of
https://github.com/Samsuik/Sakura.git
synced 2025-12-28 19:29:07 +00:00
ef63d89095
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@1d2d956 fix(#13144): Entity pathfinding paths do not appear with 1.21.9 debug flag enabled (#13202) PaperMC/Paper@cf02a07 Add Particle.Spell support to ParticleBuilder#color(Color, float) (#13128) PaperMC/Paper@97452e1 Improvements for Player#openBook (#12582) PaperMC/Paper@d16e03f [ci skip] Add IntelliJ tips to CONTRIBUTING.md (#13299) PaperMC/Paper@0e10753 Update ConcurrentUtil to 0.0.6 PaperMC/Paper@f393100 Update ConcurrentUtil to 0.0.7 PaperMC/Paper@9fc21bc Promote build channel from BETA to STABLE PaperMC/Paper@f67a1b6 fix: Player#setPlayerTime sends time update packet to client (#13315) PaperMC/Paper@af06383 Add field renames for lead sounds and iron chain (#13168) PaperMC/Paper@f8cf03d [ci skip] Mention damage behavior for Server#createWorldBorder (#13338) PaperMC/Paper@df4b668 Restore legacy command restrictions PaperMC/Paper@92ed3f0 Fix wrong translation key in /give command (#13364)
78 lines
2.6 KiB
Diff
78 lines
2.6 KiB
Diff
--- a/paper-server/build.gradle.kts
|
|
+++ b/paper-server/build.gradle.kts
|
|
@@ -12,6 +_,7 @@
|
|
}
|
|
|
|
val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
|
|
+val serverBrand = rootProject.name
|
|
|
|
dependencies {
|
|
mache("io.papermc:mache:1.21.10+build.9")
|
|
@@ -23,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
|
|
+
|
|
spigot {
|
|
enabled = true
|
|
buildDataRef = "42d18d4c4653ffc549778dbe223f6994a031d69e"
|
|
@@ -104,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())
|
|
}
|
|
@@ -127,7 +_,7 @@
|
|
}
|
|
|
|
dependencies {
|
|
- implementation(project(":paper-api"))
|
|
+ implementation(project(":$serverBrand-api"))
|
|
implementation("ca.spottedleaf:concurrentutil:0.0.7")
|
|
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
|
|
@@ -204,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.capitalized(),
|
|
"Build-Number" to (build ?: ""),
|
|
"Build-Time" to buildTime.toString(),
|
|
"Git-Branch" to gitBranch,
|
|
@@ -263,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())
|