mirror of
https://github.com/Samsuik/Sakura.git
synced 2025-12-30 04:09:09 +00:00
6144bc7fcc
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@0cf7315 Bump to adventure 4.20.0 (#12391) PaperMC/Paper@0767902 CraftBlock - fix applyBoneMeal false result (#12407) PaperMC/Paper@f00727c 1.21.5 PaperMC/Paper@8eede4b Fix AbstractHorse get/setSaddle PaperMC/Paper@93b6829 Also fix AbstractHorse getSize and isEmpty PaperMC/Paper@f517267 Add passthrough for air serialization PaperMC/Paper@4511edb [ci skip] Don't promote checking enchantment by legacy lore (#12421) PaperMC/Paper@8f62e0f Correctly order getArmorContents PaperMC/Paper@652cea5 Allow `getAsString()`-ing non-persistent entities (#12424) PaperMC/Paper@de64e70 Update spark PaperMC/Paper@1b88968 Add Entity#isTrackedBy (#12332) PaperMC/Paper@8ff94c6 Update a bunch of dependencies PaperMC/Paper@7903621 Remove json-simple imports from API, keep it as implementation in server PaperMC/Paper@dcb755a Update log4j jd link PaperMC/Paper@91bfb6f Fix freeze locked (#12434) PaperMC/Paper@121a7bf Make GameRule a FeatureDependant (#12429) PaperMC/Paper@7d5695d Improve ItemMeta#hasCustomModelData compatibility (#12414) PaperMC/Paper@de410d1 Fix reobf mappings regression in GameRules.Type (#12437) PaperMC/Paper@33e8928 Add support for bonus chest configuration in WorldCreator (#12344) PaperMC/Paper@723b511 Clone exit location passed to teleport event (#12354) PaperMC/Paper@ed32204 Clone blockpos in InsideBlockEffectApplier record
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.1")
|
|
@@ -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())
|