From 7594a540b07b0dc5dd847b4f52f9c2899c3f46af Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Wed, 20 Jul 2022 11:40:08 -0500 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@10f09b9 [ci skip] Readd "Use" Javadoc tab (#8162) PaperMC/Paper@bebfc79 Call jump event for the beast (#8100) PaperMC/Paper@16ee379 Add SpawnReason to Tadpoles spawned by Frogspawn (#8165) PaperMC/Paper@a76a1ab Make Biome implement Translatable (#8161) --- gradle.properties | 2 +- patches/api/0003-Build-System-Changes.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6f3dc3875..8db4ae855 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = org.purpurmc.purpur version = 1.19-R0.1-SNAPSHOT -paperCommit = b7faa655cb617549a3437f33c353cbaddb1746ff +paperCommit = a76a1ab86211f7afd884dbb180b1b1ccb642f267 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/api/0003-Build-System-Changes.patch b/patches/api/0003-Build-System-Changes.patch index 9be98801f..3ed3f4a53 100644 --- a/patches/api/0003-Build-System-Changes.patch +++ b/patches/api/0003-Build-System-Changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Build System Changes diff --git a/build.gradle.kts b/build.gradle.kts -index b8fa29c4e39c4587855e6c8be3f5b373bd841ba3..e16706bc30fc3c851485fe0c68be4abdcc70e6e2 100644 +index 10716b2c866631badb99b1fb79b66c62b117b038..a141e5cdcec4d09b05252782e8a0ab5fac532680 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -103,6 +103,8 @@ tasks.jar { @@ -16,4 +16,4 @@ index b8fa29c4e39c4587855e6c8be3f5b373bd841ba3..e16706bc30fc3c851485fe0c68be4abd + (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.isDocFilesSubDirs = true + options.use()