mirror of
https://github.com/Samsuik/Sakura.git
synced 2026-01-01 05:06:42 +00:00
47ec0cbf05
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@88a3a87 Configurable xp orb merge group count (#12503) PaperMC/Paper@53d1d04 Disable Item Obfuscation for entity related stacks (#12297) PaperMC/Paper@c98cd65 Add configuration interface to expose certain config values (#12273) PaperMC/Paper@42a2a6c Supports the ability for commands to be registered internally (#12520) PaperMC/Paper@753cff7 Improvements for Dump paper commands (#12512) PaperMC/Paper@e2da5d2 Registry API for supported Mob Variants (#12417) PaperMC/Paper@ab0253f Expand PlayerDeathEvent API (#12221) PaperMC/Paper@cbcf75a Update visual fire handling with TriState support (#12303) PaperMC/Paper@6c3964d Properly save level data async (#12530) PaperMC/Paper@d2ad2e6 Add missing EntityLookup#getAllMapped from Moonrise PaperMC/Paper@358e72e Remove simplify remote item matching stuff for now PaperMC/Paper@04ffca0 Also remove CraftPlayer methods PaperMC/Paper@a252581 Update mache
69 lines
2.2 KiB
Diff
69 lines
2.2 KiB
Diff
--- 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
|
|
@@ -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())
|