Updated Upstream (Bukkit/CraftBukkit) (#8378)

7 files changed, 72 insertions, 11 deletions

diff --git a/patches/api/0001-Convert-project-to-Gradle.patch b/patches/api/0001-Convert-project-to-Gradle.patch
index c4127eac2a..15069c214f 100644
--- a/patches/api/0001-Convert-project-to-Gradle.patch
+++ b/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..2c096b3ec6d77d824de974f9a6615916c0833e5f
+index 0000000000000000000000000000000000000000..16776e693165758e47152eb6726969426f180f14
 --- /dev/null
 +++ b/build.gradle.kts
 @@ -0,0 +1,81 @@
@@ -46,7 +46,7 @@ index 0000000000000000000000000000000000000000..2c096b3ec6d77d824de974f9a6615916
 +    api("com.google.guava:guava:31.0.1-jre")
 +    api("com.google.code.gson:gson:2.8.9")
 +    api("net.md-5:bungeecord-chat:1.16-R0.4")
-+    api("org.yaml:snakeyaml:1.30")
++    api("org.yaml:snakeyaml:1.32")
 +
 +    compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
 +    compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
@@ -114,7 +114,7 @@ index 0000000000000000000000000000000000000000..2c096b3ec6d77d824de974f9a6615916
 +}
 diff --git a/pom.xml b/pom.xml
 deleted file mode 100644
-index 3dc372008395cace32b28e2f08544d70f67e4511..0000000000000000000000000000000000000000
+index 9909fc466d96023f0b574a9bd2a2330d433d4400..0000000000000000000000000000000000000000
 --- a/pom.xml
 +++ /dev/null
 @@ -1,252 +0,0 @@
@@ -175,7 +175,7 @@ index 3dc372008395cace32b28e2f08544d70f67e4511..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>org.yaml</groupId>
 -            <artifactId>snakeyaml</artifactId>
--            <version>1.30</version>
+-            <version>1.32</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <!-- not part of the API proper -->
diff --git a/patches/api/0002-Build-system-changes.patch b/patches/api/0002-Build-system-changes.patch
index 8f14e47795..a4a8bdd664 100644
--- a/patches/api/0002-Build-system-changes.patch
+++ b/patches/api/0002-Build-system-changes.patch
@@ -5,13 +5,13 @@ Subject: [PATCH] Build system changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 2c096b3ec6d77d824de974f9a6615916c0833e5f..8472feb05de7955999bdfbbe721f2cfb847a9019 100644
+index 16776e693165758e47152eb6726969426f180f14..850afb1ae533bfd80ba4cc062a4394123ad22dba 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -14,15 +14,27 @@ dependencies {
      api("com.google.code.gson:gson:2.8.9")
      api("net.md-5:bungeecord-chat:1.16-R0.4")
-     api("org.yaml:snakeyaml:1.30")
+     api("org.yaml:snakeyaml:1.32")
 +    // Paper start
 +    api("com.googlecode.json-simple:json-simple:1.1.1") {
 +        isTransitive = false // includes junit
diff --git a/patches/api/0005-Adventure.patch b/patches/api/0005-Adventure.patch
index def9677043..dd030976c8 100644
--- a/patches/api/0005-Adventure.patch
+++ b/patches/api/0005-Adventure.patch
@@ -7,7 +7,7 @@ Co-authored-by: zml <[email protected]>
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 79bf95d5a19046b142d0162dd6b739b7f0f52e59..84432bf9dd99332098f952ea777ee97d987f9eb2 100644
+index 66430df2597f8c21c65f18e19d23e19bb8de8dbf..e1cd510edcd3809e18500451067314cd56f543b6 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -8,17 +8,37 @@ java {
@@ -33,7 +33,7 @@ index 79bf95d5a19046b142d0162dd6b739b7f0f52e59..84432bf9dd99332098f952ea777ee97d
      api("com.google.code.gson:gson:2.8.9")
 -    api("net.md-5:bungeecord-chat:1.16-R0.4")
 +    api("net.md-5:bungeecord-chat:1.16-R0.4-deprecated+build.6") // Paper
-     api("org.yaml:snakeyaml:1.30")
+     api("org.yaml:snakeyaml:1.32")
      // Paper start
      api("com.googlecode.json-simple:json-simple:1.1.1") {
          isTransitive = false // includes junit
diff --git a/patches/api/0396-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch b/patches/api/0396-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
new file mode 100644
index 0000000000..7fe0223346
--- /dev/null
+++ b/patches/api/0396-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
@@ -0,0 +1,61 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shane Freeder <[email protected]>
+Date: Thu, 22 Sep 2022 07:04:30 +0100
+Subject: [PATCH] Expose codepoint limit in YamlConfigOptions, and increase
+ default
+
+
+diff --git a/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java b/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java
+index 0a03cefda788b1dc57ddd61914492a15788aa3d5..df98d2c12ef4867118aba3452c3aba1175faab4e 100644
+--- a/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java
++++ b/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java
+@@ -96,6 +96,7 @@ public class YamlConfiguration extends FileConfiguration {
+     public void loadFromString(@NotNull String contents) throws InvalidConfigurationException {
+         Preconditions.checkArgument(contents != null, "Contents cannot be null");
+         yamlLoaderOptions.setProcessComments(options().parseComments());
++        yamlLoaderOptions.setCodePointLimit(options().codePointLimit()); // Paper
+ 
+         MappingNode node;
+         try (Reader reader = new UnicodeReader(new ByteArrayInputStream(contents.getBytes(StandardCharsets.UTF_8)))) {
+diff --git a/src/main/java/org/bukkit/configuration/file/YamlConfigurationOptions.java b/src/main/java/org/bukkit/configuration/file/YamlConfigurationOptions.java
+index 3f7f6caf5fcf38b65c282cd83b93e45a272b138f..2a64bc9ab9ae4a7931ebce238cdab7a37e5f85b2 100644
+--- a/src/main/java/org/bukkit/configuration/file/YamlConfigurationOptions.java
++++ b/src/main/java/org/bukkit/configuration/file/YamlConfigurationOptions.java
+@@ -12,6 +12,7 @@ import org.jetbrains.annotations.Nullable;
+ public class YamlConfigurationOptions extends FileConfigurationOptions {
+     private int indent = 2;
+     private int width = 80;
++    private int codePointLimit = 64 * 1024 * 1024; // 64 MB // Paper
+ 
+     protected YamlConfigurationOptions(@NotNull YamlConfiguration configuration) {
+         super(configuration);
+@@ -122,4 +123,29 @@ public class YamlConfigurationOptions extends FileConfigurationOptions {
+         this.width = value;
+         return this;
+     }
++
++    // Paper start
++    /**
++     * Gets the maximum code point limit, that being, the maximum length of the document
++     * in which the loader will read
++     *
++     * @return The current value
++     */
++    public int codePointLimit() {
++        return codePointLimit;
++    }
++
++    /**
++     * Sets the maximum code point limit, that being, the maximum length of the document
++     * in which the loader will read
++     *
++     * @param codePointLimit new codepoint limit
++     * @return This object, for chaining
++     */
++    @NotNull
++    public YamlConfigurationOptions codePointLimit(int codePointLimit) {
++        this.codePointLimit = codePointLimit;
++        return this;
++    }
++    // Paper end
+ }
diff --git a/patches/server/0365-Remove-garbage-Java-version-check.patch b/patches/server/0365-Remove-garbage-Java-version-check.patch
index 026d55fd76..f2867bfa7d 100644
--- a/patches/server/0365-Remove-garbage-Java-version-check.patch
+++ b/patches/server/0365-Remove-garbage-Java-version-check.patch
@@ -5,15 +5,15 @@ Subject: [PATCH] Remove garbage Java version check
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index fdbb6ab345833d8163b7d365d03b641d8a09d008..08e74f41516a545a2371a7418d995ab288831834 100644
+index d7d2618bed5188c6e6cc4db6669f3842d0bfff0c..08e74f41516a545a2371a7418d995ab288831834 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -196,10 +196,6 @@ public class Main {
                  System.err.println("Unsupported Java detected (" + javaVersion + "). This version of Minecraft requires at least Java 17. Check your Java version with the command 'java -version'.");
                  return;
              }
--            if (javaVersion > 62.0) {
--                System.err.println("Unsupported Java detected (" + javaVersion + "). Only up to Java 18 is supported.");
+-            if (javaVersion > 63.0) {
+-                System.err.println("Unsupported Java detected (" + javaVersion + "). Only up to Java 19 is supported.");
 -                return;
 -            }
  
diff --git a/work/Bukkit b/work/Bukkit
-Subproject 9ae3f10f8fa50a825af823131c468c36da3be88
+Subproject acdb55f9a97c6b361947405717eb710b0200e16
diff --git a/work/CraftBukkit b/work/CraftBukkit
-Subproject dc57aa358022f2c611f261a5e0cd6e8aef24bf7
+Subproject 08cdd26ca9c8fbae22ffa03f79ecc564f015e26