--- a/purpur-server/build.gradle.kts +++ b/purpur-server/build.gradle.kts @@ -22,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 +_,23 @@ outputDir = rootDirectory.dir("paper-server") } } - 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 spigot { buildDataRef = "3edaf46ec1eed4115ce1b18d2846cded42577e42" @@ -115,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") } } } @@ -142,10 +_,23 @@ } dependencies { - implementation(project(":purpur-api")) + implementation(project(":divinemc-api")) // DivineMC + + // DivineMC start + implementation("org.yaml:snakeyaml:2.3") + implementation ("me.carleslc.Simple-YAML:Simple-Yaml:1.8.4") { + exclude(group="org.yaml", module="snakeyaml") + } + implementation("net.objecthunter:exp4j:0.4.8") + implementation("org.agrona:agrona:2.0.1") + implementation("net.openhft:zero-allocation-hashing:0.16") + implementation("com.github.luben:zstd-jni:1.5.6-9") + implementation("org.lz4:lz4-java:1.8.0") + // DivineMC end + 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 + implementation("org.jline:jline-terminal-ffm:3.29.0") // use ffm on java 22+ // DivineMC - Bump dependencies + implementation("org.jline:jline-terminal-jni:3.29.0") // fall back to jni on java 21 // DivineMC - Bump dependencies implementation("net.minecrell:terminalconsoleappender:1.3.0") implementation("net.kyori:adventure-text-serializer-ansi:4.18.0") // Keep in sync with adventureVersion from Paper-API build file @@ -155,16 +_,16 @@ all its classes to check if they are plugins. Scanning takes about 1-2 seconds so adding this speeds up the server start. */ - implementation("org.apache.logging.log4j:log4j-core:2.19.0") - log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.19.0") // Needed to generate meta for our Log4j plugins + implementation("org.apache.logging.log4j:log4j-core:2.24.3") // DivineMC - Bump dependencies + log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.24.3") // Needed to generate meta for our Log4j plugins // DivineMC - Bump dependencies runtimeOnly(log4jPlugins.output) alsoShade(log4jPlugins.output) implementation("com.velocitypowered:velocity-native:3.4.0-SNAPSHOT") { isTransitive = false } - implementation("io.netty:netty-codec-haproxy:4.1.115.Final") // Add support for proxy protocol - implementation("org.apache.logging.log4j:log4j-iostreams:2.24.1") + implementation("io.netty:netty-codec-haproxy:4.1.119.Final") // Add support for proxy protocol // DivineMC - Bump dependencies + implementation("org.apache.logging.log4j:log4j-iostreams:2.24.3") // DivineMC - Bump dependencies implementation("org.ow2.asm:asm-commons:9.7.1") implementation("org.spongepowered:configurate-yaml:4.2.0-20250225.064233-199") implementation("org.spongepowered:configurate-core:4.2.0-20250225.064233-204") // Pinned dependency of above pinned yaml snapshot. @@ -173,22 +_,24 @@ runtimeOnly("com.mysql:mysql-connector-j:9.1.0") runtimeOnly("com.lmax:disruptor:3.4.4") - implementation("org.mozilla:rhino-runtime:1.7.14") // Purpur - implementation("org.mozilla:rhino-engine:1.7.14") // Purpur + implementation("org.mozilla:rhino-runtime:1.7.15") // Purpur // DivineMC - Bump dependencies + implementation("org.mozilla:rhino-engine:1.7.15") // Purpur // DivineMC - Bump dependencies implementation("dev.omega24:upnp4j:1.0") // Purpur runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.6") runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18") runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18") - testImplementation("io.github.classgraph:classgraph:4.8.47") // For mob goal test - testImplementation("org.junit.jupiter:junit-jupiter:5.10.2") - testImplementation("org.junit.platform:junit-platform-suite-engine:1.10.0") - testImplementation("org.hamcrest:hamcrest:2.2") - testImplementation("org.mockito:mockito-core:5.14.1") - mockitoAgent("org.mockito:mockito-core:5.14.1") { isTransitive = false } // Configure mockito agent that is needed in newer java versions + // DivineMC start - Bump dependencies + testImplementation("io.github.classgraph:classgraph:4.8.179") // For mob goal test + testImplementation("org.junit.jupiter:junit-jupiter:5.12.1") + testImplementation("org.junit.platform:junit-platform-suite-engine:1.12.1") + testImplementation("org.hamcrest:hamcrest:3.0") + testImplementation("org.mockito:mockito-core:5.16.1") + mockitoAgent("org.mockito:mockito-core:5.16.1") { isTransitive = false } // Configure mockito agent that is needed in newer java versions + // DivineMC end - Bump dependencies testImplementation("org.ow2.asm:asm-tree:9.7.1") - testImplementation("org.junit-pioneer:junit-pioneer:2.2.0") // CartesianTest + testImplementation("org.junit-pioneer:junit-pioneer:2.3.0") // CartesianTest // DivineMC - Bump dependencies implementation("net.neoforged:srgutils:1.0.9") // Mappings handling implementation("net.neoforged:AutoRenamingTool:2.0.3") // Remap plugins @@ -204,30 +_,41 @@ implementation("me.lucko:spark-paper:1.10.119-20241121.092015-1") } +// DivineMC start - hide irrelevant compilation warnings +tasks.withType { + val compilerArgs = options.compilerArgs + compilerArgs.add("-Xlint:-module") + compilerArgs.add("-Xlint:-removal") + compilerArgs.add("-Xlint:-dep-ann") +} +// DivineMC end - hide irrelevant compilation warnings + tasks.jar { manifest { val git = Git(rootProject.layout.projectDirectory.path) val mcVersion = rootProject.providers.gradleProperty("mcVersion").get() val build = System.getenv("BUILD_NUMBER") ?: null - val buildTime = if (build != null) Instant.now() else Instant.EPOCH + val buildTime = Instant.now() // DivineMC - Set build time to current val gitHash = git.exec(providers, "rev-parse", "--short=7", "HEAD").get().trim() val implementationVersion = "$mcVersion-${build ?: "DEV"}-$gitHash" val date = git.exec(providers, "show", "-s", "--format=%ci", gitHash).get().trim() val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim() + val experimental = rootProject.providers.gradleProperty("experimental").get() 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, - "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 "bxteam:divinemc", // DivineMC + "Brand-Name" to "DivineMC", // DivineMC "Build-Number" to (build ?: ""), "Build-Time" to buildTime.toString(), "Git-Branch" to gitBranch, "Git-Commit" to gitHash, + "Experimental" to experimental, // DivineMC - Experimental flag ) for (tld in setOf("net", "com", "org")) { attributes("$tld/bukkit", "Sealed" to true)