mirror of
https://github.com/Samsuik/Sakura.git
synced 2025-12-27 10:49:06 +00:00
f194568a55
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@e0ba395 Add missing plugin ticket comparator fixes #13130 PaperMC/Paper@21b4930 Fix diff in FlowingFluid#canPassThroughWall PaperMC/Paper@dcd7847 Improve server tick loop PaperMC/Paper@a4a7461 Rebase fixups PaperMC/Paper@dc66e8c Return Server#getTPS over minute intervals instead of seconds PaperMC/Paper@b63dc92 Restore currentTick counter increment as temp feature patch PaperMC/Paper@523efa4 Flatten currentTick incr into file patches PaperMC/Paper@4dcd837 Add CommandSourceStack to UnknownCommandEvent (#13083) PaperMC/Paper@ffd5158 Update 1.21.9 reobf mappings data (#13135) PaperMC/Paper@b4b1f11 [ci skip] Add docs for virtual createMerchant in MerchantInventoryViewBuilder#merchant (#13125) PaperMC/Paper@b3d2158 Disable javadoc.io links PaperMC/Paper@8483163 Yield millis from Bukkit#getAverageTickTime
78 lines
2.6 KiB
Diff
78 lines
2.6 KiB
Diff
--- a/paper-server/build.gradle.kts
|
|
+++ b/paper-server/build.gradle.kts
|
|
@@ -15,6 +_,7 @@
|
|
}
|
|
|
|
val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
|
|
+val serverBrand = rootProject.name
|
|
|
|
dependencies {
|
|
mache("io.papermc:mache:1.21.9+build.1")
|
|
@@ -26,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"
|
|
@@ -107,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.5")
|
|
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
|
|
@@ -207,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,
|
|
@@ -266,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())
|