mirror of
https://github.com/Samsuik/Sakura.git
synced 2025-12-27 10:49:06 +00:00
30ca1d8dcd
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@4e1a255 Update try catch for command handling PaperMC/Paper@e382e68 Fix 0 yield on explosion events PaperMC/Paper@35b2c6e Use dropped item for stats info (#12747) PaperMC/Paper@bd79e20 [ci skip] PluginManager#getPlugin and PluginManager#isPluginEnabled are case-insensitive (#12723) PaperMC/Paper@57c202e Allow adventure nbt codec to parse all tags PaperMC/Paper@4d854e6 Disable MC-163962 fix by default PaperMC/Paper@dda39a0 1.21.7-rc2 PaperMC/Paper@7f60924 Configuration API (#12301) PaperMC/Paper@371a422 Remove a bunch more experimental annotations (#12712) PaperMC/Paper@a9f74cb Readd dropped diff during 1.21.6 PaperMC/Paper@4045339 1.21.7 PaperMC/Paper@4c47c76 Update DataConverter constants for 1.21.7 PaperMC/Paper@9686f8b Enable obfuscation mappings for 1.21.7 (#12770) PaperMC/Paper@723510f Make warning of PlayerLoginEvent use unique plugin names (#12772) PaperMC/Paper@4cdcf00 Only namespaced reload (#12773) PaperMC/Paper@00e79df Fix wrong size in InventoryType#PLAYER (#12758) PaperMC/Paper@6e021c8 Fix CraftContainer#getNotchInventoryType detection of player inventory (#12751) PaperMC/Paper@5661fbb Add registry builder for Instrument (#12682) PaperMC/Paper@51d28af [ci skip] Typo in CartographyInventory (#12777) PaperMC/Paper@6ea679e Allow listening to plugin messages during configuration phase (#12775) PaperMC/Paper@c3be00f Always call plugin message dispatch on PlayerConnection PaperMC/Paper@3fec37a Move the double call into the dispatch method PaperMC/Paper@108255c Reduce PlayerLoginEvent alt behavior nag for now (#12782) PaperMC/Paper@2141ca5 Port plugins command to brigadier (#12632)
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.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 = "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())
|