mirror of
https://github.com/Samsuik/Sakura.git
synced 2025-12-29 11:49:07 +00:00
5ed9d4b83c
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@6e598f8 Fix incorrect createPath overload arguments, fixes #12043 (#12794) PaperMC/Paper@f7d5a0a [ci skip] Add remote build cache configuration through Gradle properties (#12797) PaperMC/Paper@b4466ec Dialog API (#12671) PaperMC/Paper@a939945 Fixup sendAllDataToRemote calls PaperMC/Paper@cb47e01 Remove more dead code, fix pre-existing desync when cancelling and closing container PaperMC/Paper@4076453 Specify the class loader when loading services (#12829) PaperMC/Paper@1bf6364 Update Mache for horse decompile fix PaperMC/Paper@76fb506 Add vanilla error message to precondition for DialogBaseImpl (#12831) PaperMC/Paper@fcfc6c3 Expose HexColor argument type (#12833) PaperMC/Paper@4000fcc Fix typo in PluginBootstrap javadocs (#12821) PaperMC/Paper@25d358c [ci skip] javadoc: Fix grammatical error for getState (#12817) PaperMC/Paper@ba7c982 Add missing Range annotations to dialog types PaperMC/Paper@533d93c Don't consume anchor charge if loc changes (#12835) PaperMC/Paper@d9b5003 Dried Ghast events and Happy Ghast spawn reason (#12788) PaperMC/Paper@bda8406 [ci skip] fix typo in AttributeInstance (#12843) PaperMC/Paper@94d60e1 Copy thrown pearls list for removal (#12840) PaperMC/Paper@21fb542 Do not write fall_distance tag unless it already existed before PaperMC/Paper@04f9519 Fix spawners converted from 1.21.4 not running finalisation logic PaperMC/Paper@22d80a3 [ci skip] Update Gradle wrapper and Fill plugin (#12846) PaperMC/Paper@a6e0c08 Add getRotation to Location (#12799) PaperMC/Paper@e792779 Allow AreaEffectCloud#setColor to reset color for null (#12760)
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.7+build.2")
|
|
@@ -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 = "436eac9815c211be1a2a6ca0702615f995e81c44"
|
|
@@ -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())
|
|
}
|
|
@@ -129,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
|
|
@@ -212,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,
|
|
@@ -271,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())
|