Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@962ee30 Updated Upstream (Paper)
PurpurMC/Purpur@74d1b4c Updated Upstream (Paper)
PurpurMC/Purpur@e2e8c61 Updated Upstream (Paper)
PurpurMC/Purpur@7a01fd8 Updated Upstream (Paper)
PurpurMC/Purpur@34c18f0 Updated Upstream (Paper)
PurpurMC/Purpur@ca668ab Updated Upstream (Paper)

patches/api/0001-Divine-Branding.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Divine Branding
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 628ec6699d34c1877c02001de95096bc7b44120e..92a2b2494cc181e76528af403cd866f82e3de736 100644
+index b0fd6c1804844f09428051952e3ac4e58f8c859c..b2d0775719ef98fa3006a8c674df60ce8aa6c077 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -237,3 +237,12 @@ tasks.check {
+@@ -255,3 +255,12 @@ tasks.check {
      dependsOn(scanJarForOldGeneratedCode)
  }
  // Paper end

patches/api/0002-Divine-Configuration.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Divine Configuration
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 84b07a7fd7941b2f75b531646b67a124a0607390..10b3a0b42f1c3fca9714b578cbb20ad727a4d5bb 100644
+index ddb1ff894910761a78b91a343f32e129f03a03c4..ca097588b84912b6d8a763b7e36885fbdf3dffec 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2277,6 +2277,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2295,6 +2295,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          }
          // Purpur end
  

patches/api/0005-Delete-Timings.patch

@@ -2104,23 +2104,28 @@ index 632c4961515f5052551f841cfa840e60bba7a257..00000000000000000000000000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 0a26fffe9b1e5080b5639767a03af11006108b4a..c55bc18316d4be79bd610128f0592b13325cf534 100644
+index 0a26fffe9b1e5080b5639767a03af11006108b4a..3b73c0e59788f5f49ca2423032550f11855d52ae 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
-@@ -37,11 +37,6 @@ public abstract class Command {
-      * @deprecated Timings will be removed in the future
-      */
-     @Deprecated(forRemoval = true)
+@@ -33,16 +33,6 @@ public abstract class Command {
+     protected String usageMessage;
+     private String permission;
+     private net.kyori.adventure.text.Component permissionMessage; // Paper
+-    /**
+-     * @deprecated Timings will be removed in the future
+-     */
+-    @Deprecated(forRemoval = true)
 -    public co.aikar.timings.Timing timings; // Paper
 -    /**
 -     * @deprecated Timings will be removed in the future
 -     */
 -    @Deprecated(forRemoval = true)
-     @NotNull public String getTimingName() {return getName();} // Paper
+-    @NotNull public String getTimingName() {return getName();} // Paper
  
      protected Command(@NotNull String name) {
+         this(name, "", "/" + name, new ArrayList<String>());
 diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
-index abe256e1e45ce28036da4aa1586715bc8a1a3414..b359306500e640f4b0761ae9aa996cf64e4fe63f 100644
+index abe256e1e45ce28036da4aa1586715bc8a1a3414..9eab8024e0675865f17669847759a26d28f74f3a 100644
 --- a/src/main/java/org/bukkit/command/FormattedCommandAlias.java
 +++ b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
 @@ -12,7 +12,6 @@ public class FormattedCommandAlias extends Command {
@@ -2131,6 +2136,17 @@ index abe256e1e45ce28036da4aa1586715bc8a1a3414..b359306500e640f4b0761ae9aa996cf6
          this.formatStrings = formatStrings;
      }
  
+@@ -120,10 +119,6 @@ public class FormattedCommandAlias extends Command {
+         return formatString.trim(); // Paper - Causes an extra space at the end, breaks with brig commands
+     }
+ 
+-    @NotNull
+-    @Override // Paper
+-    public String getTimingName() {return "Command Forwarder - " + super.getTimingName();} // Paper
+-
+     private static boolean inRange(int i, int j, int k) {
+         return i >= j && i <= k;
+     }
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
 index 7740ad53796d08584bb0110f99af5639993e4d71..f0da5a8ae7e989e120f9d5ef2a417a9840aed7d0 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java

patches/api/0006-DivineMC-API-Publish.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] DivineMC API Publish
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 92a2b2494cc181e76528af403cd866f82e3de736..f459d04e10c7162405cea4ce39c94073dfa0b9d5 100644
+index b2d0775719ef98fa3006a8c674df60ce8aa6c077..b0b9d9d37c86fd409353c8d18551f1ced7fe4272 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -246,3 +246,14 @@ tasks.withType<JavaCompile> {
+@@ -264,3 +264,14 @@ tasks.withType<JavaCompile> {
      compilerArgs.add("-Xlint:-dep-ann")
  }
  // DivineMC end

patches/api/0007-Bump-Dependencies.patch

@@ -5,10 +5,19 @@ Subject: [PATCH] Bump Dependencies
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index f459d04e10c7162405cea4ce39c94073dfa0b9d5..b6cfcd33f79171ff34fd598babc8956f04d37410 100644
+index b0b9d9d37c86fd409353c8d18551f1ced7fe4272..ed0f69335089c459061241afc8cc93ba82212013 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -12,8 +12,8 @@ java {
+@@ -9,11 +9,17 @@ java {
+     withJavadocJar()
+ }
+ 
++// DivineMC start - Bump Dependencies
++repositories {
++    mavenCentral()
++}
++// DivineMC end
++
  val annotationsVersion = "24.1.0"
  val bungeeCordChatVersion = "1.20-R0.2"
  val adventureVersion = "4.17.0"
@@ -19,16 +28,7 @@ index f459d04e10c7162405cea4ce39c94073dfa0b9d5..b6cfcd33f79171ff34fd598babc8956f
  val apiAndDocs: Configuration by configurations.creating {
      attributes {
          attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
-@@ -26,11 +26,17 @@ configurations.api {
-     extendsFrom(apiAndDocs)
- }
- 
-+// DivineMC start - Bump Dependencies
-+repositories {
-+    mavenCentral()
-+}
-+// DivineMC end
-+
+@@ -41,8 +47,8 @@ abstract class MockitoAgentProvider : CommandLineArgumentProvider {
  dependencies {
      api("com.mojang:brigadier:1.2.9") // Paper - Brigadier command api
      // api dependencies are listed transitively to API consumers
@@ -39,7 +39,7 @@ index f459d04e10c7162405cea4ce39c94073dfa0b9d5..b6cfcd33f79171ff34fd598babc8956f
      // Paper start - adventure
      api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.18") {
          exclude("com.google.guava", "guava")
-@@ -42,7 +48,7 @@ dependencies {
+@@ -54,7 +60,7 @@ dependencies {
      api("com.googlecode.json-simple:json-simple:1.1.1") {
          isTransitive = false // includes junit
      }
@@ -48,7 +48,7 @@ index f459d04e10c7162405cea4ce39c94073dfa0b9d5..b6cfcd33f79171ff34fd598babc8956f
      apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion"))
      apiAndDocs("net.kyori:adventure-api")
      apiAndDocs("net.kyori:adventure-text-minimessage")
-@@ -58,23 +64,23 @@ dependencies {
+@@ -70,23 +76,23 @@ dependencies {
      implementation("org.ow2.asm:asm-commons:9.7.1")
      // Paper end
  
@@ -78,7 +78,7 @@ index f459d04e10c7162405cea4ce39c94073dfa0b9d5..b6cfcd33f79171ff34fd598babc8956f
      testImplementation("org.hamcrest:hamcrest:2.2")
      testImplementation("org.mockito:mockito-core:5.14.1")
      testImplementation("org.ow2.asm:asm-tree:9.7.1")
-@@ -162,12 +168,12 @@ tasks.withType<Javadoc> {
+@@ -175,12 +181,12 @@ tasks.withType<Javadoc> {
      options.use()
      options.isDocFilesSubDirs = true
      options.links(
@@ -93,7 +93,7 @@ index f459d04e10c7162405cea4ce39c94073dfa0b9d5..b6cfcd33f79171ff34fd598babc8956f
          "https://www.javadoc.io/doc/com.google.code.gson/gson/2.10.1",
          "https://jspecify.dev/docs/api/",
          // Paper end
-@@ -180,9 +186,9 @@ tasks.withType<Javadoc> {
+@@ -193,9 +199,9 @@ tasks.withType<Javadoc> {
          "https://jd.advntr.dev/text-serializer-plain/$adventureVersion/",
          "https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/",
          "https://javadoc.io/doc/org.slf4j/slf4j-api/$slf4jVersion/",