Updated Upstream (Paper/Pufferfish/Purpur/Leaves/dependencies)

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

@@ -6,7 +6,7 @@ Subject: [PATCH] Purpur API Changes
 Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur
 
-Commit: 69d6fae0647074feeb4eb7a2b98fcc2979cc9f92
+Commit: 6bb7f82f3b685113c92ce6480e2ba698d05ab57c
 
 Patches below are removed in this patch:
 Pufferfish-API-Changes.patch
@@ -578,10 +578,10 @@ index a5938b0a960121bd77a13e4c8fc8a053bea481c5..c55819f56b4a3850496feef6900c1ec8
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index da524a71af74b02515b037f7fe09ba6988e2c8bf..3679c3b8d31ab8de08ecabd56bf92ffc062f971c 100644
+index 91eb95b04094394e8dc1e3a3343efc63690c87e4..d8ef44761148f928a671ceba74a5d1cb87af81d9 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -4008,6 +4008,86 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4072,6 +4072,86 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      @Nullable
      public DragonBattle getEnderDragonBattle();
  

patches/api/0004-Remove-Timings.patch

@@ -2830,10 +2830,10 @@ index 3e61a926620a67daec3af54b72a1b911eaef2ed4..00000000000000000000000000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 9237e2fca0557890b718de9029207a552396e45a..359c72a5fc0a98a71429907a437a1c7be03ed64c 100644
+index a4b38f284d4fea7df7f9df9bf44e4f68fefaf20f..2a5f381e4a755ec5f2692731a5499a8ab95c3b36 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -35,7 +35,6 @@ public interface UnsafeValues {
+@@ -36,7 +36,6 @@ public interface UnsafeValues {
      net.kyori.adventure.text.Component resolveWithContext(net.kyori.adventure.text.Component component, org.bukkit.command.CommandSender context, org.bukkit.entity.Entity scoreboardSubject, boolean bypassPermissions) throws java.io.IOException;
      // Paper end
  
@@ -2841,7 +2841,7 @@ index 9237e2fca0557890b718de9029207a552396e45a..359c72a5fc0a98a71429907a437a1c7b
      Material toLegacy(Material material);
  
      Material fromLegacy(Material material);
-@@ -113,11 +112,6 @@ public interface UnsafeValues {
+@@ -122,11 +121,6 @@ public interface UnsafeValues {
      // Paper end
  
      // Paper start

patches/api/0005-Bump-Dependencies.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index d0cfdfc846d0d644349ee59c3a9b0ad8d32e4352..f6f8fc879d938d31b184216eaccb477637be5a13 100644
+index d0cfdfc846d0d644349ee59c3a9b0ad8d32e4352..463f4e0851f0bc3d227caaf12acc0dc8573d0010 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -11,8 +11,8 @@ java {
@@ -15,10 +15,19 @@ index d0cfdfc846d0d644349ee59c3a9b0ad8d32e4352..f6f8fc879d938d31b184216eaccb4776
 -val slf4jVersion = "1.8.0-beta4"
 -val log4jVersion = "2.17.1"
 +val slf4jVersion = "2.0.9" // Leaf - Bump Dependencies
-+val log4jVersion = "2.20.0" // Leaf - Bump Dependencies
++val log4jVersion = "2.21.0" // Leaf - Bump Dependencies
  val apiAndDocs: Configuration by configurations.creating {
      attributes {
          attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
+@@ -27,7 +27,7 @@ configurations.api {
+ 
+ dependencies {
+     // api dependencies are listed transitively to API consumers
+-    api("com.google.guava:guava:32.1.2-jre")
++    api("com.google.guava:guava:32.1.3-jre") // Leaf - Bump Dependencies
+     api("com.google.code.gson:gson:2.10.1")
+     api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.14") // Paper
+     api("org.yaml:snakeyaml:2.2")
 @@ -36,7 +36,7 @@ dependencies {
      api("com.googlecode.json-simple:json-simple:1.1.1") {
          isTransitive = false // includes junit
@@ -71,6 +80,15 @@ index d0cfdfc846d0d644349ee59c3a9b0ad8d32e4352..f6f8fc879d938d31b184216eaccb4776
  }
  
  configure<PublishingExtension> {
+@@ -123,7 +125,7 @@ tasks.withType<Javadoc> {
+     options.use()
+     options.isDocFilesSubDirs = true
+     options.links(
+-        "https://guava.dev/releases/32.1.2-jre/api/docs/",
++        "https://guava.dev/releases/32.1.3-jre/api/docs/", // Leaf - Bump Dependencies
+         "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
+         "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations
+         // "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/", // Paper - don't link to bungee chat
 @@ -141,7 +143,7 @@ tasks.withType<Javadoc> {
          "https://javadoc.io/doc/org.slf4j/slf4j-api/$slf4jVersion/",
          "https://javadoc.io/doc/org.apache.logging.log4j/log4j-api/$log4jVersion/",