From df8d28a450fe391b9f0c2dc4a64543cf9b84266f Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Tue, 21 Dec 2021 01:17:52 -0800
Subject: [PATCH] Update checker framework & log4j-api for paper-api (also
 rebuild patches)

Note that the log4j-api version used in paper-api does not affect the version used in paper-server, this just affects the version people will see in their IDE when compiling against paper-api.
---
 patches/api/0002-Build-system-changes.patch               | 8 ++++----
 .../api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch | 4 ++--
 ...write-chunk-data-to-disk-if-it-serializes-witho.patch} | 0
 ....patch => 0831-Fix-tripwire-state-inconsistency.patch} | 0
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename patches/server/{0832-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch => 0830-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch} (100%)
 rename patches/server/{0833-Fix-tripwire-state-inconsistency.patch => 0831-Fix-tripwire-state-inconsistency.patch} (100%)

diff --git a/patches/api/0002-Build-system-changes.patch b/patches/api/0002-Build-system-changes.patch
index fb74bef974..b9c0bae06d 100644
--- a/patches/api/0002-Build-system-changes.patch
+++ b/patches/api/0002-Build-system-changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Build system changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index c76bfbcfbe034700bdbd9396643cfca625273a14..364b6215d2facb0273a67ff605ccb8e707e080b8 100644
+index c76bfbcfbe034700bdbd9396643cfca625273a14..1f680baffba17265e8ce38b3516624bffd034075 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -15,15 +15,27 @@ dependencies {
@@ -29,9 +29,9 @@ index c76bfbcfbe034700bdbd9396643cfca625273a14..364b6215d2facb0273a67ff605ccb8e7
      testCompileOnly(annotations)
  
 +    // Paper start - add checker
-+    val checkerAnnotations = "org.checkerframework:checker-qual:3.19.0"
-+    compileOnlyApi(checkerAnnotations)
-+    testCompileOnly(checkerAnnotations)
++    val checkerQual = "org.checkerframework:checker-qual:3.21.0"
++    compileOnlyApi(checkerQual)
++    testCompileOnly(checkerQual)
 +    // Paper end
 +
      testImplementation("junit:junit:4.13.2")
diff --git a/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch b/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch
index 16b6080ff4..6b9df358dc 100644
--- a/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch
+++ b/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch
@@ -14,14 +14,14 @@ it without having to shade it in the plugin and going through
 several layers of logging abstraction.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 5a1b66c6692451a78be6c4adb103de34bb06b056..591f30a41d6f39683c60758c2e9f32bb6b476a62 100644
+index d8d459561cc75935136f8f9888ff27b45ad98f9e..a23b2bd8e1ca1ff8d0ad5ed5d5e41c89e4795090 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -38,6 +38,8 @@ dependencies {
      apiAndDocs("net.kyori:adventure-text-serializer-gson")
      apiAndDocs("net.kyori:adventure-text-serializer-legacy")
      apiAndDocs("net.kyori:adventure-text-serializer-plain")
-+    api("org.apache.logging.log4j:log4j-api:2.14.1")
++    api("org.apache.logging.log4j:log4j-api:2.17.0")
 +    api("org.slf4j:slf4j-api:1.8.0-beta4")
  
      implementation("org.ow2.asm:asm:9.2")
diff --git a/patches/server/0832-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0830-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 100%
rename from patches/server/0832-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/server/0830-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0833-Fix-tripwire-state-inconsistency.patch b/patches/server/0831-Fix-tripwire-state-inconsistency.patch
similarity index 100%
rename from patches/server/0833-Fix-tripwire-state-inconsistency.patch
rename to patches/server/0831-Fix-tripwire-state-inconsistency.patch