So it begins...

2023-09-21 19:18:04 +02:00
parent efc1f99846
commit 524eeedaa8
1048 changed files with 66 additions and 59 deletions
--- a/patches/api/Add-GameEvent-tags.patch
+++ b/patches/api/Add-GameEvent-tags.patch
@@ -12,6 +12,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      * Vanilla tag representing entities which are dismounted when underwater.
      */
     Tag<EntityType> ENTITY_TYPES_DISMOUNTS_UNDERWATER = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("dismounts_underwater"), EntityType.class);
+
+     /**
+      * Vanilla tag representing entities which are not controlled by their mount.
+      */
+     Tag<EntityType> ENTITY_TYPES_NON_CONTROLLING_RIDER = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("non_controlling_rider"), EntityType.class);
+ 
 +    // Paper start
 +    String REGISTRY_GAME_EVENTS = "game_events";
 +
@@ -30,6 +36,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     */
 +    Tag<GameEvent> GAME_EVENT_ALLAY_CAN_LISTEN = Bukkit.getTag(REGISTRY_GAME_EVENTS, NamespacedKey.minecraft("allay_can_listen"), GameEvent.class);
 +    // Paper end
- 
+
     /**
      * Returns whether or not this tag has an entry for the specified item.
+      *
--- a/patches/api/Adventure.patch
+++ b/patches/api/Adventure.patch
@@ -29,11 +29,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 
 dependencies {
     // api dependencies are listed transitively to API consumers
-     api("com.google.guava:guava:31.1-jre")
-     api("com.google.code.gson:gson:2.10")
+     api("com.google.guava:guava:32.1.2-jre")
+     api("com.google.code.gson:gson:2.10.1")
 -    api("net.md-5:bungeecord-chat:$bungeeCordChatVersion")
 +    api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.14") // Paper
-     api("org.yaml:snakeyaml:2.0")
+     api("org.yaml:snakeyaml:2.2")
     api("org.joml:joml:1.10.5")
     // Paper start
@@ -0,0 +0,0 @@ dependencies {
@@ -51,14 +51,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 
     compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
@@ -0,0 +0,0 @@ tasks.withType<Javadoc> {
-         "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/",
+         "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/",
 +        // "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/", // Paper - don't link to bungee chat
         // Paper start - add missing javadoc links
         "https://javadoc.io/doc/org.joml/joml/1.10.5/index.html",
-         "https://www.javadoc.io/doc/com.google.code.gson/gson/2.10",
+         "https://www.javadoc.io/doc/com.google.code.gson/gson/2.10.1",
         // Paper end
 +        // Paper start
 +        "https://jd.advntr.dev/api/$adventureVersion/",
--- a/patches/api/Build-system-changes.patch
+++ b/patches/api/Build-system-changes.patch
@@ -10,7 +10,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +++ b/build.gradle.kts
@@ -0,0 +0,0 @@ dependencies {
     api("net.md-5:bungeecord-chat:$bungeeCordChatVersion")
-     api("org.yaml:snakeyaml:2.0")
+     api("org.yaml:snakeyaml:2.2")
     api("org.joml:joml:1.10.5")
 +    // Paper start
 +    api("com.googlecode.json-simple:json-simple:1.1.1") {
@@ -39,14 +39,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
     testImplementation("org.hamcrest:hamcrest-library:1.3")
@@ -0,0 +0,0 @@ tasks.withType<Javadoc> {
     options.links(
-         "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/",
+         "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
 -        "https://javadoc.io/doc/org.jetbrains/annotations-java5/$annotationsVersion/",
 +        "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 start - add missing javadoc links
 +        "https://javadoc.io/doc/org.joml/joml/1.10.5/index.html",
-+        "https://www.javadoc.io/doc/com.google.code.gson/gson/2.10",
+        "https://www.javadoc.io/doc/com.google.code.gson/gson/2.10.1",
 +        // Paper end
     )
     options.tags("apiNote:a:API Note:")
--- a/patches/api/Convert-project-to-Gradle.patch
+++ b/patches/api/Convert-project-to-Gradle.patch
@@ -46,10 +46,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +dependencies {
 +    // api dependencies are listed transitively to API consumers
-+    api("com.google.guava:guava:31.1-jre")
-+    api("com.google.code.gson:gson:2.10")
+    api("com.google.guava:guava:32.1.2-jre")
+    api("com.google.code.gson:gson:2.10.1")
 +    api("net.md-5:bungeecord-chat:$bungeeCordChatVersion")
-+    api("org.yaml:snakeyaml:2.0")
+    api("org.yaml:snakeyaml:2.2")
 +    api("org.joml:joml:1.10.5")
 +
 +    compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
@@ -100,8 +100,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    options.use()
 +    options.isDocFilesSubDirs = true
 +    options.links(
-+        "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/",
+        "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
 +        "https://javadoc.io/doc/org.jetbrains/annotations-java5/$annotationsVersion/",
 +        "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/",
 +    )
@@ -131,7 +131,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot-api</artifactId>
-    <version>1.20.1-R0.1-SNAPSHOT</version>
+-    <version>1.20.2-R0.1-SNAPSHOT</version>
 -    <packaging>jar</packaging>
 -
 -    <name>Spigot-API</name>
@@ -161,14 +161,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>com.google.guava</groupId>
 -            <artifactId>guava</artifactId>
-            <version>31.1-jre</version>
+-            <version>32.1.2-jre</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <!-- bundled with Minecraft, should be kept in sync -->
 -        <dependency>
 -            <groupId>com.google.code.gson</groupId>
 -            <artifactId>gson</artifactId>
-            <version>2.10</version>
+-            <version>2.10.1</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <!-- bundled with Minecraft, should be kept in sync -->
@@ -188,7 +188,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>org.yaml</groupId>
 -            <artifactId>snakeyaml</artifactId>
-            <version>2.0</version>
+-            <version>2.2</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <!-- not part of the API proper -->
--- a/patches/api/PotionEffect-clone-methods.patch
+++ b/patches/api/PotionEffect-clone-methods.patch
@@ -41,4 +41,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
     @NotNull
     private static PotionEffectType getEffectType(@NotNull Map<?, ?> map) {
-         int type = getInt(map, TYPE);
+         PotionEffectType effect;