Updated Upstream (Gale/Purpur/Pufferfish/Dependencies)

patches/api/0001-Pufferfish-Sentry.patch

@@ -7,14 +7,14 @@ Original license: GPL v3
 Original project: https://github.com/pufferfish-gg/Pufferfish
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 8825fd8ff27ba641deaa61c8a5cadb2b236b6512..b9fe57f709de6dc262295a0a0134c371ddd69baa 100644
+index 2020f6a2487fe93e98ea0e7faa0995b56a43b174..63c267dca9a97b877fe9bab526f1461b8346b82d 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -46,6 +46,7 @@ dependencies {
      apiAndDocs("net.kyori:adventure-text-logger-slf4j")
      api("org.apache.logging.log4j:log4j-api:$log4jVersion")
      api("org.slf4j:slf4j-api:$slf4jVersion")
-+    api("io.sentry:sentry:6.25.2") // Pufferfish
++    api("io.sentry:sentry:6.28.0") // Pufferfish
  
      implementation("org.ow2.asm:asm:9.4")
      implementation("org.ow2.asm:asm-commons:9.4")
@@ -216,7 +216,7 @@ index fc2dae69165776d08274e34a69962cc70445f411..899d67fa782fac639fe7fb096e05c551
                      callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerEventException(msg, ex, registration.getPlugin(), registration.getListener(), event)));
                  }
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 12fe20a5a05dc3780def4c0cb3de0b291c2a8185..3755da1134c109b138b32ebe04a451b5ec88bf72 100644
+index 92d20e70d26318fbaed8adffd21c6b77336eb9c5..f7266e3991d991e7d7b38752ed472bc9cfa5f43c 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 @@ -343,7 +343,13 @@ public final class JavaPluginLoader implements PluginLoader {

patches/api/0002-Purpur-API-Changes.patch

@@ -3,7 +3,7 @@ From: Github Actions <no-reply@github.com>
 Date: Fri, 16 Jun 2023 05:21:52 +0000
 Subject: [PATCH] Purpur API Changes
 
-Commit: 8ef1580b1f5a1cd8dbd624b65fd4a8920ce52287
+Commit: 042e192444ecc577c172710e3dab1d38413b1ea2
 
 Patches below are removed in this patch:
 Build-System-Changes.patch
@@ -320,10 +320,10 @@ index 03b47012447430a350e152920f754d993d4023db..3ad843d519e239430c5f4f5754a8da30
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index 9b84cb5abdf3db55cbc7ba19c8cd6955bf4fc5ec..5616d2acfa8180f71ae4123845fc126508f73b90 100644
+index bce07d84cafca677bb6fad78c21b82097f06430c..4ef0fa4f1ef72bb784674671473c6a322acadecc 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
-@@ -506,4 +506,114 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
+@@ -522,4 +522,114 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
       */
      @Nullable
      public Location getLastDeathLocation();

patches/api/0004-Bump-Dependencies.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index c4653ddd2c087d14d7415d55fc8e6faab0b3b8ff..71039c1476b088c77b84838f705498b4c4f981f1 100644
+index 63c267dca9a97b877fe9bab526f1461b8346b82d..069ed3987f14c41177eca29637af85beda82280c 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -11,8 +11,8 @@ java {
@@ -14,7 +14,7 @@ index c4653ddd2c087d14d7415d55fc8e6faab0b3b8ff..71039c1476b088c77b84838f705498b4
  val adventureVersion = "4.14.0"
 -val slf4jVersion = "1.8.0-beta4"
 -val log4jVersion = "2.17.1"
-+val slf4jVersion = "2.0.7" // Leaf - Bump Dependencies
++val slf4jVersion = "2.0.9" // Leaf - Bump Dependencies
 +val log4jVersion = "2.20.0" // Leaf - Bump Dependencies
  val apiAndDocs: Configuration by configurations.creating {
      attributes {
@@ -29,7 +29,7 @@ index c4653ddd2c087d14d7415d55fc8e6faab0b3b8ff..71039c1476b088c77b84838f705498b4
 +    api("com.google.code.gson:gson:2.10.1") // Leaf - Bump Dependencies
      api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.14") // Paper
 -    api("org.yaml:snakeyaml:2.0")
-+    api("org.yaml:snakeyaml:2.1") // Leaf - Bump Dependencies
++    api("org.yaml:snakeyaml:2.2") // Leaf - Bump Dependencies
      api("org.joml:joml:1.10.5")
      // Paper start
      api("com.googlecode.json-simple:json-simple:1.1.1") {
@@ -42,7 +42,7 @@ index c4653ddd2c087d14d7415d55fc8e6faab0b3b8ff..71039c1476b088c77b84838f705498b4
      apiAndDocs("net.kyori:adventure-text-minimessage")
 @@ -48,30 +48,33 @@ dependencies {
      api("org.slf4j:slf4j-api:$slf4jVersion")
-     api("io.sentry:sentry:6.25.2") // Pufferfish
+     api("io.sentry:sentry:6.28.0") // Pufferfish
  
 -    implementation("org.ow2.asm:asm:9.4")
 -    implementation("org.ow2.asm:asm-commons:9.4")
@@ -66,12 +66,12 @@ index c4653ddd2c087d14d7415d55fc8e6faab0b3b8ff..71039c1476b088c77b84838f705498b4
  
      // Paper start - add checker
 -    val checkerQual = "org.checkerframework:checker-qual:3.21.0"
-+    val checkerQual = "org.checkerframework:checker-qual:3.37.0"
++    val checkerQual = "org.checkerframework:checker-qual:3.38.0" // Leaf - Bump Dependencies
      compileOnlyApi(checkerQual)
      testCompileOnly(checkerQual)
      // Paper end
 -    testImplementation("org.mockito:mockito-core:4.9.0") // Paper - add mockito
-+    testImplementation("org.mockito:mockito-core:5.4.0") // Paper - add mockito
++    testImplementation("org.mockito:mockito-core:5.5.0") // Paper - add mockito // Leaf - Bump Dependencies
  
 -    testImplementation("org.apache.commons:commons-lang3:3.12.0")
 +    testImplementation("org.apache.commons:commons-lang3:3.13.0")
@@ -91,7 +91,7 @@ index c4653ddd2c087d14d7415d55fc8e6faab0b3b8ff..71039c1476b088c77b84838f705498b4
 -        "https://guava.dev/releases/31.1-jre/api/docs/",
 -        "https://javadoc.io/doc/org.yaml/snakeyaml/2.0/",
 +        "https://guava.dev/releases/32.1.2-jre/api/docs/", // Leaf - Bump Dependencies
-+        "https://javadoc.io/doc/org.yaml/snakeyaml/2.1/", // Leaf - Bump Dependencies
++        "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/", // Leaf - Bump Dependencies
          "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations
          // Paper start
          // "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/", // don't link to bungee chat