mirror of
https://github.com/BX-Team/DivineMC.git
synced 2025-12-30 12:19:13 +00:00
79 lines
3.4 KiB
Diff
79 lines
3.4 KiB
Diff
--- a/purpur-server/build.gradle.kts
|
|
+++ b/purpur-server/build.gradle.kts
|
|
@@ -21,6 +_,7 @@
|
|
// gitFilePatches = true
|
|
|
|
val purpur = forks.register("purpur") {
|
|
+ rootDirectory = upstreamsDirectory().map { it.dir("purpur") }
|
|
upstream.patchDir("paperServer") {
|
|
upstreamPath = "paper-server"
|
|
excludes = setOf("src/minecraft", "patches", "build.gradle.kts")
|
|
@@ -29,7 +_,22 @@
|
|
}
|
|
}
|
|
|
|
- activeFork = purpur
|
|
+ val divinemc = forks.register("divinemc") {
|
|
+ forks = purpur
|
|
+ upstream.patchRepo("paperServer") {
|
|
+ upstreamRepo = purpur.patchedRepo("paperServer")
|
|
+ patchesDir = rootDirectory.dir("divinemc-server/paper-patches")
|
|
+ outputDir = rootDirectory.dir("paper-server")
|
|
+ }
|
|
+ upstream.patchDir("purpurServer") {
|
|
+ upstreamPath = "purpur-server"
|
|
+ excludes = setOf("src/minecraft", "paper-patches", "minecraft-patches", "build.gradle.kts", "build.gradle.kts.patch")
|
|
+ patchesDir = rootDirectory.dir("divinemc-server/purpur-patches")
|
|
+ outputDir = rootDirectory.dir("purpur-server")
|
|
+ }
|
|
+ }
|
|
+
|
|
+ activeFork = divinemc
|
|
|
|
paper {
|
|
paperServerDir = upstreamsDirectory().map { it.dir("paper/paper-server") }
|
|
@@ -119,10 +_,14 @@
|
|
main {
|
|
java { srcDir("../paper-server/src/main/java") }
|
|
resources { srcDir("../paper-server/src/main/resources") }
|
|
+ java { srcDir("../purpur-server/src/main/java") }
|
|
+ resources { srcDir("../purpur-server/src/main/resources") }
|
|
}
|
|
test {
|
|
java { srcDir("../paper-server/src/test/java") }
|
|
resources { srcDir("../paper-server/src/test/resources") }
|
|
+ java { srcDir("../purpur-server/src/test/java") }
|
|
+ resources { srcDir("../purpur-server/src/test/resources") }
|
|
}
|
|
}
|
|
val log4jPlugins = sourceSets.create("log4jPlugins") {
|
|
@@ -146,7 +_,7 @@
|
|
// Paper end - configure mockito agent that is needed in newer java versions
|
|
|
|
dependencies {
|
|
- implementation(project(":purpur-api"))
|
|
+ implementation(project(":divinemc-api")) // DivineMC
|
|
implementation("ca.spottedleaf:concurrentutil:0.0.2") // Paper - Add ConcurrentUtil dependency
|
|
// Paper start
|
|
implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
|
|
@@ -219,14 +_,14 @@
|
|
val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim() // Paper
|
|
attributes(
|
|
"Main-Class" to "org.bukkit.craftbukkit.Main",
|
|
- "Implementation-Title" to "Purpur", // Purpur
|
|
+ "Implementation-Title" to "DivineMC", // DivineMC
|
|
"Implementation-Version" to implementationVersion,
|
|
"Implementation-Vendor" to date, // Paper
|
|
- "Specification-Title" to "Purpur", // Purpur
|
|
+ "Specification-Title" to "DivineMC", // DivineMC
|
|
"Specification-Version" to project.version,
|
|
- "Specification-Vendor" to "Purpur Team", // Purpur
|
|
- "Brand-Id" to "purpurmc:purpur", // Purpur
|
|
- "Brand-Name" to "Purpur", // Purpur
|
|
+ "Specification-Vendor" to "BX Team", // DivineMC
|
|
+ "Brand-Id" to "divinemc:divinemc", // DivineMC
|
|
+ "Brand-Name" to "DivineMC", // DivineMC
|
|
"Build-Number" to (build ?: ""),
|
|
"Build-Time" to buildTime.toString(),
|
|
"Git-Branch" to gitBranch, // Paper
|