Start working on 1.19.4

README.md

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

build.gradle.kts

@@ -61,7 +61,7 @@ repositories {
 }
 
 dependencies {
-    paramMappings("net.fabricmc:yarn:1.19.3+build.1:mergedv2")
+    paramMappings("net.fabricmc:yarn:1.19.4+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,7 +133,7 @@ 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"))
 }
 
 tasks.register("printMinecraftVersion") {

gradle.properties

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

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

@@ -27,10 +27,10 @@ index 11038da2e071699d6561a331565db0c8d7850d0e..317acfec5894101294a55abff6181943
 +/.factorypath
 diff --git a/build.gradle.kts b/build.gradle.kts
 new file mode 100644
-index 0000000000000000000000000000000000000000..386d8c36510e69a69ce4536e67af4a6e4e886685
+index 0000000000000000000000000000000000000000..17e8858e01d80c422947f507e9d77b7532788752
 --- /dev/null
 +++ b/build.gradle.kts
-@@ -0,0 +1,81 @@
+@@ -0,0 +1,82 @@
 +plugins {
 +    `java-library`
 +    `maven-publish`
@@ -47,6 +47,7 @@ index 0000000000000000000000000000000000000000..386d8c36510e69a69ce4536e67af4a6e
 +    api("com.google.code.gson:gson:2.10")
 +    api("net.md-5:bungeecord-chat:1.16-R0.4")
 +    api("org.yaml:snakeyaml:1.33")
++    api("org.joml:joml:1.10.5")
 +
 +    compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
 +    compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
@@ -114,10 +115,10 @@ index 0000000000000000000000000000000000000000..386d8c36510e69a69ce4536e67af4a6e
 +}
 diff --git a/pom.xml b/pom.xml
 deleted file mode 100644
-index afe250e329e19a56f58085efeaa28d86b79118ec..0000000000000000000000000000000000000000
+index 829ebece9d376cbade1422c58759540054fbedbe..0000000000000000000000000000000000000000
 --- a/pom.xml
 +++ /dev/null
-@@ -1,254 +0,0 @@
+@@ -1,261 +0,0 @@
 -
 -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 -         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -125,7 +126,7 @@ index afe250e329e19a56f58085efeaa28d86b79118ec..00000000000000000000000000000000
 -
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot-api</artifactId>
--    <version>1.19.3-R0.1-SNAPSHOT</version>
+-    <version>1.19.4-R0.1-SNAPSHOT</version>
 -    <packaging>jar</packaging>
 -
 -    <name>Spigot-API</name>
@@ -165,6 +166,13 @@ index afe250e329e19a56f58085efeaa28d86b79118ec..00000000000000000000000000000000
 -            <version>2.10</version>
 -            <scope>compile</scope>
 -        </dependency>
+-        <!-- bundled with Minecraft, should be kept in sync -->
+-        <dependency>
+-            <groupId>org.joml</groupId>
+-            <artifactId>joml</artifactId>
+-            <version>1.10.5</version>
+-            <scope>compile</scope>
+-        </dependency>
 -        <dependency>
 -            <groupId>net.md-5</groupId>
 -            <artifactId>bungeecord-chat</artifactId>

patches/server/0001-Setup-Gradle-project.patch

@@ -28,7 +28,7 @@ index 3df8c60ab5cd1454660980883f80668d535b742b..37c3a00659ce21623be07317f4f6a45b
 +/.factorypath
 diff --git a/build.gradle.kts b/build.gradle.kts
 new file mode 100644
-index 0000000000000000000000000000000000000000..c9950851db38df64fd82a3a549072d240e37d64d
+index 0000000000000000000000000000000000000000..6aed6ea708639e43aea6ed467792a55b747fdad7
 --- /dev/null
 +++ b/build.gradle.kts
 @@ -0,0 +1,137 @@
@@ -49,7 +49,7 @@ index 0000000000000000000000000000000000000000..c9950851db38df64fd82a3a549072d24
 +    implementation("org.ow2.asm:asm:9.4")
 +    implementation("commons-lang:commons-lang:2.6")
 +    runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3")
-+    runtimeOnly("mysql:mysql-connector-java:8.0.29")
++    runtimeOnly("com.mysql:mysql-connector-j:8.0.32")
 +
 +    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..c9950851db38df64fd82a3a549072d24
 +    testImplementation("org.hamcrest:hamcrest-library:1.3")
 +}
 +
-+val craftbukkitPackageVersion = "1_19_R2" // Paper
++val craftbukkitPackageVersion = "1_19_R3" // Paper
 +tasks.jar {
 +    archiveClassifier.set("dev")
 +
@@ -171,17 +171,17 @@ index 0000000000000000000000000000000000000000..c9950851db38df64fd82a3a549072d24
 +}
 diff --git a/pom.xml b/pom.xml
 deleted file mode 100644
-index 1f24a779e3dd95a796f7eae2b2097b5aabc4fdb8..0000000000000000000000000000000000000000
+index 9c1719f6931450637a93f64fd2b43b2cd00929a0..0000000000000000000000000000000000000000
 --- a/pom.xml
 +++ /dev/null
-@@ -1,617 +0,0 @@
+@@ -1,585 +0,0 @@
 -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 -         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 -    <modelVersion>4.0.0</modelVersion>
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot</artifactId>
 -    <packaging>jar</packaging>
--    <version>1.19.3-R0.1-SNAPSHOT</version>
+-    <version>1.19.4-R0.1-SNAPSHOT</version>
 -    <name>Spigot</name>
 -    <url>https://www.spigotmc.org/</url>
 -
@@ -197,7 +197,7 @@ index 1f24a779e3dd95a796f7eae2b2097b5aabc4fdb8..00000000000000000000000000000000
 -        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 -        <api.version>unknown</api.version>
 -        <bt.name>git</bt.name>
--        <minecraft_version>1_19_R2</minecraft_version>
+-        <minecraft_version>1_19_R3</minecraft_version>
 -        <maven.compiler.source>17</maven.compiler.source>
 -        <maven.compiler.target>17</maven.compiler.target>
 -    </properties>
@@ -251,7 +251,7 @@ index 1f24a779e3dd95a796f7eae2b2097b5aabc4fdb8..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>com.mojang</groupId>
 -            <artifactId>authlib</artifactId>
--            <version>3.16.29</version>
+-            <version>3.17.30</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
@@ -263,13 +263,7 @@ index 1f24a779e3dd95a796f7eae2b2097b5aabc4fdb8..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>com.mojang</groupId>
 -            <artifactId>datafixerupper</artifactId>
--            <version>5.0.28</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>com.mojang</groupId>
--            <artifactId>javabridge</artifactId>
--            <version>2.0.25</version>
+-            <version>6.0.6</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
@@ -389,12 +383,6 @@ index 1f24a779e3dd95a796f7eae2b2097b5aabc4fdb8..00000000000000000000000000000000
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
--            <groupId>org.joml</groupId>
--            <artifactId>joml</artifactId>
--            <version>1.10.5</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
 -            <groupId>org.slf4j</groupId>
 -            <artifactId>slf4j-api</artifactId>
 -            <version>2.0.1</version>
@@ -417,13 +405,13 @@ index 1f24a779e3dd95a796f7eae2b2097b5aabc4fdb8..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>org.xerial</groupId>
 -            <artifactId>sqlite-jdbc</artifactId>
--            <version>3.36.0.3</version>
+-            <version>3.41.0.0</version>
 -            <scope>runtime</scope>
 -        </dependency>
 -        <dependency>
--            <groupId>mysql</groupId>
--            <artifactId>mysql-connector-java</artifactId>
--            <version>8.0.29</version>
+-            <groupId>com.mysql</groupId>
+-            <artifactId>mysql-connector-j</artifactId>
+-            <version>8.0.32</version>
 -            <scope>runtime</scope>
 -        </dependency>
 -        <!-- add these back in as they are not exposed by the API -->
@@ -728,26 +716,6 @@ index 1f24a779e3dd95a796f7eae2b2097b5aabc4fdb8..00000000000000000000000000000000
 -                            </dependency>
 -                        </dependencies>
 -                    </plugin>
--                    <plugin>
--                        <groupId>org.codehaus.mojo</groupId>
--                        <artifactId>animal-sniffer-maven-plugin</artifactId>
--                        <version>1.21</version>
--                        <executions>
--                            <execution>
--                                <phase>process-classes</phase>
--                                <goals>
--                                    <!--<goal>check</goal>-->
--                                </goals>
--                            </execution>
--                        </executions>
--                        <configuration>
--                            <signature>
--                                <groupId>org.codehaus.mojo.signature</groupId>
--                                <artifactId>java18</artifactId>
--                                <version>1.0</version>
--                            </signature>
--                        </configuration>
--                    </plugin>
 -                </plugins>
 -            </build>
 -        </profile>

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Build system changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 9686f621c7b837a7a38ffb2fea10ae492b18556d..2b3288057d67e5add4e22e6b7072527057bcd808 100644
+index 386d8c36510e69a69ce4536e67af4a6e4e886685..75d59838512a8385c95222083a67b81d060b6a90 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -14,15 +14,27 @@ dependencies {

patches/unapplied/api/0003-Test-changes.patch

@@ -11,7 +11,7 @@ Subject: [PATCH] Test changes
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 2b3288057d67e5add4e22e6b7072527057bcd808..4b3453f8dab6008b6fad6245fb7205da33b4bfb8 100644
+index 75d59838512a8385c95222083a67b81d060b6a90..4c34d36b1f62ea08e6a64d15effb3c07370200cf 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -34,6 +34,7 @@ dependencies {

patches/unapplied/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 4b3453f8dab6008b6fad6245fb7205da33b4bfb8..d217f708b5bc57e402f4c2179ae3aea555b40f92 100644
+index 4c34d36b1f62ea08e6a64d15effb3c07370200cf..57634e3710f459e6f42c5d284d873091afdd1ea4 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -18,6 +18,7 @@ dependencies {

patches/unapplied/api/0005-Adventure.patch

@@ -7,7 +7,7 @@ Co-authored-by: zml <zml@stellardrift.ca>
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index d217f708b5bc57e402f4c2179ae3aea555b40f92..4ad00c44b635e1d0b882399b0c76ab32d6bb2501 100644
+index 57634e3710f459e6f42c5d284d873091afdd1ea4..45f29dd1b1d683f6a4d8b91b81274565d75d4d73 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -8,17 +8,37 @@ java {

patches/unapplied/api/0010-Timings-v2.patch

@@ -3472,7 +3472,7 @@ index f64a90241ce7f73e111e6b5ac6ff87cd93583c0e..f13dcbe448111b24b36105d25527ba87
  
      // Paper start
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index d0ad072c832b8fc8a1cfdcafdd42c724531a2e29..02062284dbc1a6c923ceffa5e4d6a3be8c7429d3 100644
+index ab04ffe4cd05315a2ee0f64c553b4c674740eb7f..de6b6188587fd254ab96cbc1f95fda2056d9cbe2 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 @@ -55,7 +55,6 @@ public final class JavaPluginLoader implements PluginLoader {

patches/unapplied/api/0011-Add-command-line-option-to-load-extra-plugin-jars-no.patch

@@ -82,7 +82,7 @@ index f13dcbe448111b24b36105d25527ba87ccc9334e..3fcb73a0fc2daaeb76dd4c6757afce52
          }
          Preconditions.checkArgument(directory != null, "Directory cannot be null");
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 02062284dbc1a6c923ceffa5e4d6a3be8c7429d3..88d852c1a729ffd5951da803da424b31591c9f9a 100644
+index de6b6188587fd254ab96cbc1f95fda2056d9cbe2..eaefbb00e9993d54906cc8cf35cf753c0d6c7707 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 @@ -93,7 +93,7 @@ public final class JavaPluginLoader implements PluginLoader {

patches/unapplied/api/0072-Add-workaround-for-plugins-modifying-the-parent-of-t.patch

@@ -93,7 +93,7 @@ index 71c8d2345eef6895edb8d210553ec3cddd9c76d0..6d31f3a2569ae9c522a5e6cddd38ac8f
  
      /**
 diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-index 2f045068c34c7c007565b7d7a17b7a003a79f37b..805f2bef4a785cb9639afd40ef820452efd1b2cf 100644
+index 2d2fa6ce5200eb5c75a733f9f54f400113cc22b0..5c5aadc15c8198e0e79b4ac0f043a45720aef002 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 @@ -65,7 +65,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm