Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7116)

Author: NoahvdAa

patches/api/0001-Convert-project-to-Gradle.patch

@@ -27,7 +27,7 @@ index e431e3435737e28394d81b56568a08b3c3148b9b..b23bde3b5e881f146539a307d0a59f21
 +/.factorypath
 diff --git a/build.gradle.kts b/build.gradle.kts
 new file mode 100644
-index 0000000000000000000000000000000000000000..1b16a242187079f80720fc1990ee09bb6a5c2768
+index 0000000000000000000000000000000000000000..c76bfbcfbe034700bdbd9396643cfca625273a14
 --- /dev/null
 +++ b/build.gradle.kts
 @@ -0,0 +1,66 @@
@@ -47,17 +47,17 @@ index 0000000000000000000000000000000000000000..1b16a242187079f80720fc1990ee09bb
 +    api("com.google.guava:guava:31.0.1-jre")
 +    api("com.google.code.gson:gson:2.8.8")
 +    api("net.md-5:bungeecord-chat:1.16-R0.4")
-+    api("org.yaml:snakeyaml:1.28")
++    api("org.yaml:snakeyaml:1.30")
 +
-+    compileOnly("org.apache.maven:maven-resolver-provider:3.8.1")
-+    compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")
-+    compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.0")
++    compileOnly("org.apache.maven:maven-resolver-provider:3.8.4")
++    compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.2")
++    compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.2")
 +
-+    val annotations = "org.jetbrains:annotations-java5:21.0.1"
++    val annotations = "org.jetbrains:annotations-java5:23.0.0"
 +    compileOnly(annotations)
 +    testCompileOnly(annotations)
 +
-+    testImplementation("junit:junit:4.13.1")
++    testImplementation("junit:junit:4.13.2")
 +    testImplementation("org.hamcrest:hamcrest-library:1.3")
 +    testImplementation("org.ow2.asm:asm-tree:9.2")
 +}
@@ -92,14 +92,14 @@ index 0000000000000000000000000000000000000000..1b16a242187079f80720fc1990ee09bb
 +tasks.withType<Javadoc> {
 +    (options as StandardJavadocDocletOptions).links(
 +        "https://guava.dev/releases/31.0.1-jre/api/docs/",
-+        "https://javadoc.io/doc/org.yaml/snakeyaml/1.28/",
-+        "https://javadoc.io/doc/org.jetbrains/annotations-java5/21.0.1/",
++        "https://javadoc.io/doc/org.yaml/snakeyaml/1.30/",
++        "https://javadoc.io/doc/org.jetbrains/annotations-java5/23.0.0/",
 +        "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/",
 +    )
 +}
 diff --git a/pom.xml b/pom.xml
 deleted file mode 100644
-index 0e69806e4b6fa44d1d2f8ebf1cf0dc4ef386e69e..0000000000000000000000000000000000000000
+index 9c130bf7fe7ec4b6b5d4f4c30cdbe6dc75b0f9a0..0000000000000000000000000000000000000000
 --- a/pom.xml
 +++ /dev/null
 @@ -1,262 +0,0 @@
@@ -166,40 +166,40 @@ index 0e69806e4b6fa44d1d2f8ebf1cf0dc4ef386e69e..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>org.yaml</groupId>
 -            <artifactId>snakeyaml</artifactId>
--            <version>1.28</version>
+-            <version>1.30</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <!-- not part of the API proper -->
 -        <dependency>
 -            <groupId>org.apache.maven</groupId>
 -            <artifactId>maven-resolver-provider</artifactId>
--            <version>3.8.1</version>
+-            <version>3.8.4</version>
 -            <scope>provided</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>org.apache.maven.resolver</groupId>
 -            <artifactId>maven-resolver-connector-basic</artifactId>
--            <version>1.7.0</version>
+-            <version>1.7.2</version>
 -            <scope>provided</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>org.apache.maven.resolver</groupId>
 -            <artifactId>maven-resolver-transport-http</artifactId>
--            <version>1.7.0</version>
+-            <version>1.7.2</version>
 -            <scope>provided</scope>
 -        </dependency>
 -        <!-- annotations -->
 -        <dependency>
 -            <groupId>org.jetbrains</groupId>
 -            <artifactId>annotations-java5</artifactId>
--            <version>21.0.1</version>
+-            <version>23.0.0</version>
 -            <scope>provided</scope>
 -        </dependency>
 -        <!-- testing -->
 -        <dependency>
 -            <groupId>junit</groupId>
 -            <artifactId>junit</artifactId>
--            <version>4.13.1</version>
+-            <version>4.13.2</version>
 -            <scope>test</scope>
 -        </dependency>
 -        <dependency>
@@ -248,7 +248,7 @@ index 0e69806e4b6fa44d1d2f8ebf1cf0dc4ef386e69e..00000000000000000000000000000000
 -                    <dependency>
 -                        <groupId>org.eclipse.jdt</groupId>
 -                        <artifactId>ecj</artifactId>
--                        <version>3.27.0</version>
+-                        <version>3.28.0</version>
 -                    </dependency>
 -                </dependencies>
 -            </plugin>
@@ -299,8 +299,8 @@ index 0e69806e4b6fa44d1d2f8ebf1cf0dc4ef386e69e..00000000000000000000000000000000
 -                <configuration>
 -                    <links>
 -                        <link>https://guava.dev/releases/31.0.1-jre/api/docs/</link>
--                        <link>https://javadoc.io/doc/org.yaml/snakeyaml/1.28/</link>
--                        <link>https://javadoc.io/doc/org.jetbrains/annotations-java5/21.0.1/</link>
+-                        <link>https://javadoc.io/doc/org.yaml/snakeyaml/1.30/</link>
+-                        <link>https://javadoc.io/doc/org.jetbrains/annotations-java5/23.0.0/</link>
 -                        <link>https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/</link>
 -                    </links>
 -                </configuration>

patches/api/0002-Build-system-changes.patch

@@ -5,26 +5,26 @@ Subject: [PATCH] Build system changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 1b16a242187079f80720fc1990ee09bb6a5c2768..b6ec62c00140a1e225e93c4b0413c0767f4ca5b8 100644
+index c76bfbcfbe034700bdbd9396643cfca625273a14..364b6215d2facb0273a67ff605ccb8e707e080b8 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -15,15 +15,27 @@ dependencies {
      api("com.google.code.gson:gson:2.8.8")
      api("net.md-5:bungeecord-chat:1.16-R0.4")
-     api("org.yaml:snakeyaml:1.28")
+     api("org.yaml:snakeyaml:1.30")
 +    // Paper start
 +    api("com.googlecode.json-simple:json-simple:1.1.1") {
 +        isTransitive = false // includes junit
 +    }
 +    // Paper end
 
-     compileOnly("org.apache.maven:maven-resolver-provider:3.8.1")
-     compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")
-     compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.0")
+     compileOnly("org.apache.maven:maven-resolver-provider:3.8.4")
+     compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.2")
+     compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.2")
 +    compileOnly("com.google.code.findbugs:jsr305:1.3.9") // Paper
 
--    val annotations = "org.jetbrains:annotations-java5:21.0.1"
-+    val annotations = "org.jetbrains:annotations:21.0.1" // Paper - we don't want Java 5 annotations...
+-    val annotations = "org.jetbrains:annotations-java5:23.0.0"
++    val annotations = "org.jetbrains:annotations:23.0.0" // Paper - we don't want Java 5 annotations...
      compileOnly(annotations)
      testCompileOnly(annotations)
 
@@ -34,15 +34,15 @@ index 1b16a242187079f80720fc1990ee09bb6a5c2768..b6ec62c00140a1e225e93c4b0413c076
 +    testCompileOnly(checkerAnnotations)
 +    // Paper end
 +
-     testImplementation("junit:junit:4.13.1")
+     testImplementation("junit:junit:4.13.2")
      testImplementation("org.hamcrest:hamcrest-library:1.3")
      testImplementation("org.ow2.asm:asm-tree:9.2")
 @@ -60,7 +72,7 @@ tasks.withType<Javadoc> {
      (options as StandardJavadocDocletOptions).links(
          "https://guava.dev/releases/31.0.1-jre/api/docs/",
-         "https://javadoc.io/doc/org.yaml/snakeyaml/1.28/",
--        "https://javadoc.io/doc/org.jetbrains/annotations-java5/21.0.1/",
-+        "https://javadoc.io/doc/org.jetbrains/annotations/21.0.1/", // Paper - we don't want Java 5 annotations
+         "https://javadoc.io/doc/org.yaml/snakeyaml/1.30/",
+-        "https://javadoc.io/doc/org.jetbrains/annotations-java5/23.0.0/",
++        "https://javadoc.io/doc/org.jetbrains/annotations/23.0.0/", // Paper - we don't want Java 5 annotations
          "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/",
      )
  }

patches/api/0004-Add-FastUtil-to-Bukkit.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Add FastUtil to Bukkit
 Doesn't expose to plugins, just allows Paper-API to use it for optimization
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 1168642d832727af2173dfcae6d132a9d44132c1..a1fd76a7a7fea04a67752ff60834b566fe6f5ec5 100644
+index 364b6215d2facb0273a67ff605ccb8e707e080b8..3777d12874ede329410a6bf1c0533deb44924d73 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -19,6 +19,7 @@ dependencies {
@@ -16,4 +16,4 @@ index 1168642d832727af2173dfcae6d132a9d44132c1..a1fd76a7a7fea04a67752ff60834b566
 +    api("it.unimi.dsi:fastutil:8.5.6")
      // Paper end
 
-     compileOnly("org.apache.maven:maven-resolver-provider:3.8.1")
+     compileOnly("org.apache.maven:maven-resolver-provider:3.8.4")

patches/api/0006-Timings-v2.patch

@@ -2782,10 +2782,10 @@ index 0000000000000000000000000000000000000000..5989ee21297935651b0edd44b8239e65
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 806aeee78956fc79fda62c706f40d3edd2ef8388..a238302f2a12194aa30a88867070705dc749b36b 100644
+index 072bcbbbf167e02ce5014b672f2cf63122d29b21..de7f303bce9e2454eaec12131cd1439a54281c7e 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -704,7 +704,6 @@ public final class Bukkit {
+@@ -747,7 +747,6 @@ public final class Bukkit {
       */
      public static void reload() {
          server.reload();
@@ -2794,10 +2794,10 @@ index 806aeee78956fc79fda62c706f40d3edd2ef8388..a238302f2a12194aa30a88867070705d
 
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 70d711b51e6bb3860c17e631fe5892b6bde9b245..3e91c4000c468fd8bdcb938e942a7bbf4988cab2 100644
+index 2bfccae871b92749fa5893b5a7ff327fc93695ad..31e989bdaf60d38e14c84c4a0a31ede6e1a72e86 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1465,6 +1465,26 @@ public interface Server extends PluginMessageRecipient {
+@@ -1500,6 +1500,26 @@ public interface Server extends PluginMessageRecipient {
              throw new UnsupportedOperationException("Not supported yet.");
          }
 
@@ -3377,10 +3377,10 @@ index 2a145d851ce30360aa39549745bd87590c034584..00000000000000000000000000000000
 -    // Spigot end
 -}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 9a864f54992cd0a6987d095ef3b98dd500d0eff9..4a20f96268ea831ed4fdd236b582abdf07dc4748 100644
+index 709016bdc30d5502765af842d4fc83af53779a9e..c36e4ceb1094aa9469f976e0952e2725358ff761 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1469,7 +1469,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1610,7 +1610,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
           */
          public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @Nullable UUID sender, @NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
              throw new UnsupportedOperationException("Not supported yet.");