mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
c3870bda5a
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@4511edb8 [ci/skip] Don't promote checking enchantment by legacy lore (#12421) PaperMC/Paper@8f62e0fb Correctly order getArmorContents PaperMC/Paper@652cea57 Allow `getAsString()`-ing non-persistent entities (#12424) PaperMC/Paper@de64e704 Update spark PaperMC/Paper@1b889688 Add Entity#isTrackedBy (#12332) PaperMC/Paper@8ff94c63 Update a bunch of dependencies PaperMC/Paper@79036210 Remove json-simple imports from API, keep it as implementation in server PaperMC/Paper@dcb755ac Update log4j jd link PaperMC/Paper@91bfb6fb Fix freeze locked (#12434) PaperMC/Paper@121a7bf4 Make GameRule a FeatureDependant (#12429) PaperMC/Paper@7d5695d7 Improve ItemMeta#hasCustomModelData compatibility (#12414) PaperMC/Paper@de410d13 Fix reobf mappings regression in GameRules.Type (#12437) PaperMC/Paper@33e8928f Add support for bonus chest configuration in WorldCreator (#12344) PaperMC/Paper@723b511f Clone exit location passed to teleport event (#12354) PaperMC/Paper@ed322043 Clone blockpos in InsideBlockEffectApplier record PaperMC/Paper@6b4ad082 Add PlayerRespawnEvent#isMissingRespawnBlock (#12422) PaperMC/Paper@c0bd5688 Add logic for Human canUseEquipmentSlot (#12433)
57 lines
2.1 KiB
Diff
57 lines
2.1 KiB
Diff
--- a/paper-api/build.gradle.kts
|
|
+++ b/paper-api/build.gradle.kts
|
|
@@ -93,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())
|
|
@@ -103,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"))
|
|
}
|
|
}
|
|
}
|
|
@@ -168,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(
|
|
@@ -202,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")
|