So it begins...

README.md

@@ -40,7 +40,7 @@ How To (Plugin Developers)
 <dependency>
     <groupId>io.papermc.paper</groupId>
     <artifactId>paper-api</artifactId>
-    <version>1.20.1-R0.1-SNAPSHOT</version>
+    <version>1.20.2-R0.1-SNAPSHOT</version>
     <scope>provided</scope>
 </dependency>
 ```
@@ -53,7 +53,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly("io.papermc.paper:paper-api:1.20.1-R0.1-SNAPSHOT")
+    compileOnly("io.papermc.paper:paper-api:1.20.2-R0.1-SNAPSHOT")
 }
 
 java {

build.gradle.kts

@@ -61,7 +61,7 @@ repositories {
 }
 
 dependencies {
-    paramMappings("net.fabricmc:yarn:1.20.1+build.1:mergedv2")
+    paramMappings("net.fabricmc:yarn:1.20.2+build.1:mergedv2")
     remapper("net.fabricmc:tiny-remapper:0.8.6:fat")
     decompiler("net.minecraftforge:forgeflower:2.0.627.2")
     spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.6")
@@ -133,13 +133,13 @@ allprojects {
 
 tasks.collectAtsFromPatches {
     // Uncomment while updating for a new Minecraft version
-    // extraPatchDir.set(layout.projectDirectory.dir("patches/unapplied/server"))
+    extraPatchDir.set(layout.projectDirectory.dir("patches/unapplied/server"))
 }
 
 // Uncomment while updating for a new Minecraft version
-// tasks.withType<io.papermc.paperweight.tasks.RebuildGitPatches> {
+tasks.withType<io.papermc.paperweight.tasks.RebuildGitPatches> {
-//     filterPatches.set(false)
+    filterPatches.set(false)
-// }
+}
 
 tasks.register("printMinecraftVersion") {
     doLast {

gradle.properties

@@ -1,6 +1,6 @@
 group=io.papermc.paper
-version=1.20.1-R0.1-SNAPSHOT
+version=1.20.2-R0.1-SNAPSHOT
-mcVersion=1.20.1
+mcVersion=1.20.2
 
 org.gradle.caching=true
 org.gradle.parallel=true

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.
+      *

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.guava:guava:32.1.2-jre")
-     api("com.google.code.gson:gson:2.10")
+     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://guava.dev/releases/32.1.2-jre/api/docs/",
-         "https://javadoc.io/doc/org.yaml/snakeyaml/2.0/",
+         "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/",

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://guava.dev/releases/32.1.2-jre/api/docs/",
-         "https://javadoc.io/doc/org.yaml/snakeyaml/2.0/",
+         "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:")

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.guava:guava:32.1.2-jre")
-+    api("com.google.code.gson:gson:2.10")
++    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://guava.dev/releases/32.1.2-jre/api/docs/",
-+        "https://javadoc.io/doc/org.yaml/snakeyaml/2.0/",
++        "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 -->

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;

patches/server/Setup-Gradle-project.patch

@@ -48,8 +48,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +    implementation("org.ow2.asm:asm:9.5")
 +    implementation("commons-lang:commons-lang:2.6")
-+    runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.0")
++    runtimeOnly("org.xerial:sqlite-jdbc:3.43.0.0")
-+    runtimeOnly("com.mysql:mysql-connector-j:8.0.33")
++    runtimeOnly("com.mysql:mysql-connector-j:8.1.0")
 +
 +    runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5")
 +    runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
@@ -59,7 +59,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    testImplementation("org.hamcrest:hamcrest-library:1.3")
 +}
 +
-+val craftbukkitPackageVersion = "1_20_R1" // Paper
++val craftbukkitPackageVersion = "1_20_R2" // Paper
 +tasks.jar {
 +    archiveClassifier.set("dev")
 +
@@ -182,7 +182,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot</artifactId>
 -    <packaging>jar</packaging>
--    <version>1.20.1-R0.1-SNAPSHOT</version>
+-    <version>1.20.2-R0.1-SNAPSHOT</version>
 -    <name>Spigot</name>
 -    <url>https://www.spigotmc.org/</url>
 -
@@ -198,7 +198,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 -        <api.version>unknown</api.version>
 -        <bt.name>git</bt.name>
--        <minecraft_version>1_20_R1</minecraft_version>
+-        <minecraft_version>1_20_R2</minecraft_version>
 -        <maven.compiler.source>17</maven.compiler.source>
 -        <maven.compiler.target>17</maven.compiler.target>
 -    </properties>
@@ -246,13 +246,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>com.github.oshi</groupId>
 -            <artifactId>oshi-core</artifactId>
--            <version>6.2.2</version>
+-            <version>6.4.5</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>com.mojang</groupId>
 -            <artifactId>authlib</artifactId>
--            <version>4.0.43</version>
+-            <version>5.0.47</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
@@ -276,87 +276,87 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>commons-io</groupId>
 -            <artifactId>commons-io</artifactId>
--            <version>2.11.0</version>
+-            <version>2.13.0</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>io.netty</groupId>
 -            <artifactId>netty-buffer</artifactId>
--            <version>4.1.82.Final</version>
+-            <version>4.1.97.Final</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>io.netty</groupId>
 -            <artifactId>netty-codec</artifactId>
--            <version>4.1.82.Final</version>
+-            <version>4.1.97.Final</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>io.netty</groupId>
 -            <artifactId>netty-common</artifactId>
--            <version>4.1.82.Final</version>
+-            <version>4.1.97.Final</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>io.netty</groupId>
 -            <artifactId>netty-handler</artifactId>
--            <version>4.1.82.Final</version>
+-            <version>4.1.97.Final</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>io.netty</groupId>
 -            <artifactId>netty-resolver</artifactId>
--            <version>4.1.82.Final</version>
+-            <version>4.1.97.Final</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>io.netty</groupId>
 -            <artifactId>netty-transport</artifactId>
--            <version>4.1.82.Final</version>
+-            <version>4.1.97.Final</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>io.netty</groupId>
 -            <artifactId>netty-transport-classes-epoll</artifactId>
--            <version>4.1.82.Final</version>
+-            <version>4.1.97.Final</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>io.netty</groupId>
 -            <artifactId>netty-transport-native-epoll</artifactId>
--            <version>4.1.82.Final</version>
+-            <version>4.1.97.Final</version>
 -            <classifier>linux-x86_64</classifier>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>io.netty</groupId>
 -            <artifactId>netty-transport-native-epoll</artifactId>
--            <version>4.1.82.Final</version>
+-            <version>4.1.97.Final</version>
 -            <classifier>linux-aarch_64</classifier>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>io.netty</groupId>
 -            <artifactId>netty-transport-native-unix-common</artifactId>
--            <version>4.1.82.Final</version>
+-            <version>4.1.97.Final</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>it.unimi.dsi</groupId>
 -            <artifactId>fastutil</artifactId>
--            <version>8.5.9</version>
+-            <version>8.5.12</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>net.java.dev.jna</groupId>
 -            <artifactId>jna</artifactId>
--            <version>5.12.1</version>
+-            <version>5.13.0</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>net.java.dev.jna</groupId>
 -            <artifactId>jna-platform</artifactId>
--            <version>5.12.1</version>
+-            <version>5.13.0</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
@@ -368,7 +368,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>org.apache.commons</groupId>
 -            <artifactId>commons-lang3</artifactId>
--            <version>3.12.0</version>
+-            <version>3.13.0</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
@@ -386,7 +386,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>org.slf4j</groupId>
 -            <artifactId>slf4j-api</artifactId>
--            <version>2.0.1</version>
+-            <version>2.0.7</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <!-- deprecated API depend -->
@@ -406,13 +406,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>org.xerial</groupId>
 -            <artifactId>sqlite-jdbc</artifactId>
--            <version>3.42.0.0</version>
+-            <version>3.43.0.0</version>
 -            <scope>runtime</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>com.mysql</groupId>
 -            <artifactId>mysql-connector-j</artifactId>
--            <version>8.0.33</version>
+-            <version>8.1.0</version>
 -            <scope>runtime</scope>
 -        </dependency>
 -        <!-- add these back in as they are not exposed by the API -->