mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
8c77678e81
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@9e873f50 Fix inconsistencies between offline/online spawn position getter (#11960) PaperMC/Paper@fc0c3717 Fix handling of resultant crafting container from craftItemResult (#12307) PaperMC/Paper@a7a76c8f Add methods for Armadillo (#12031) PaperMC/Paper@a74400d9 Update adventure to 4.21.0 (#12499) PaperMC/Paper@1e930763 Fix ipv6 loopback addresses being able to get connection throttled (#12155) PaperMC/Paper@646b80ca Fix unnecessary map data saves (#12296) PaperMC/Paper@e663f999 Add combat tracker API (#11853) PaperMC/Paper@cd4fe5b7 [ci/skip] Drop non-applicable ATs (#12498) PaperMC/Paper@5acfdd6a Fix save/load NaN Entity Motion (#12269) PaperMC/Paper@2754d7c3 Add Throw EntityChangeBlockEvent for BrushableBlockEntity#brush (#12133) PaperMC/Paper@567f63ae Parity for respawn events (#11792)
57 lines
2.1 KiB
Diff
57 lines
2.1 KiB
Diff
--- a/paper-api/build.gradle.kts
|
|
+++ b/paper-api/build.gradle.kts
|
|
@@ -90,7 +_,7 @@
|
|
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
|
|
}
|
|
|
|
-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-api/src/generated/java").asFile.toPath()
|
|
idea {
|
|
module {
|
|
generatedSourceDirs.add(generatedDir.toFile())
|
|
@@ -100,6 +_,18 @@
|
|
main {
|
|
java {
|
|
srcDir(generatedDir)
|
|
+ srcDir(file("../paper-api/src/main/java"))
|
|
+ }
|
|
+ resources {
|
|
+ srcDir(file("../paper-api/src/main/resources"))
|
|
+ }
|
|
+ }
|
|
+ test {
|
|
+ java {
|
|
+ srcDir(file("../paper-api/src/test/java"))
|
|
+ }
|
|
+ resources {
|
|
+ srcDir(file("../paper-api/src/test/resources"))
|
|
}
|
|
}
|
|
}
|
|
@@ -165,8 +_,10 @@
|
|
val services = objects.newInstance<Services>()
|
|
|
|
tasks.withType<Javadoc> {
|
|
+ //(options as StandardJavadocDocletOptions).addStringOption("-add-modules", "jdk.incubator.vector") // Purpur - our javadocs need this for pufferfish's SIMD patch
|
|
+ (options as StandardJavadocDocletOptions).addStringOption("Xdoclint:none", "-quiet") // Purpur - silence Paper's bajillion javadoc warnings
|
|
val options = options as StandardJavadocDocletOptions
|
|
- options.overview = "src/main/javadoc/overview.html"
|
|
+ options.overview = "../paper-api/src/main/javadoc/overview.html"
|
|
options.use()
|
|
options.isDocFilesSubDirs = true
|
|
options.links(
|
|
@@ -199,11 +_,11 @@
|
|
}
|
|
|
|
// workaround for https://github.com/gradle/gradle/issues/4046
|
|
- inputs.dir("src/main/javadoc").withPropertyName("javadoc-sourceset")
|
|
+ inputs.dir("../paper-api/src/main/javadoc").withPropertyName("javadoc-sourceset")
|
|
val fsOps = services.fileSystemOperations
|
|
doLast {
|
|
fsOps.copy {
|
|
- from("src/main/javadoc") {
|
|
+ from("../paper-api/src/main/javadoc") {
|
|
include("**/doc-files/**")
|
|
}
|
|
into("build/docs/javadoc")
|