diff --git a/patches/api/0001-Convert-project-to-Gradle.patch b/patches/api/0001-Convert-project-to-Gradle.patch index b1908e572b..993a62ed7a 100644 --- a/patches/api/0001-Convert-project-to-Gradle.patch +++ b/patches/api/0001-Convert-project-to-Gradle.patch @@ -19,7 +19,7 @@ index e431e3435737e28394d81b56568a08b3c3148b9b..c484aff2c192bf42059b5689327909e4 /.project diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 -index 0000000000000000000000000000000000000000..b378772dce6fddf0a3f24e1c48667602fc356e51 +index 0000000000000000000000000000000000000000..e74ac6187426c9468e551e9d068d05534e2ad6fe --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,67 @@ @@ -41,7 +41,7 @@ index 0000000000000000000000000000000000000000..b378772dce6fddf0a3f24e1c48667602 + api("com.google.guava:guava:21.0") + api("com.google.code.gson:gson:2.8.0") + api("net.md-5:bungeecord-chat:1.16-R0.4") -+ api("org.yaml:snakeyaml:1.29") ++ api("org.yaml:snakeyaml:1.28") + + compileOnly("org.apache.maven:maven-resolver-provider:3.8.1") + compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0") diff --git a/patches/api/0002-Build-system-changes.patch b/patches/api/0002-Build-system-changes.patch index bee7c46e5e..da7010d158 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 b378772dce6fddf0a3f24e1c48667602fc356e51..c54be6e9df689433a8aa280541cf9366609a3c27 100644 +index e74ac6187426c9468e551e9d068d05534e2ad6fe..b1a33fdfd6495e5243315312aca97c2512a64dcc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,12 +17,14 @@ dependencies { api("com.google.code.gson:gson:2.8.0") api("net.md-5:bungeecord-chat:1.16-R0.4") - api("org.yaml:snakeyaml:1.29") + api("org.yaml:snakeyaml:1.28") + api("com.googlecode.json-simple:json-simple:1.1.1") // Paper compileOnly("org.apache.maven:maven-resolver-provider:3.8.1") diff --git a/patches/api/0003-Add-FastUtil-to-Bukkit.patch b/patches/api/0003-Add-FastUtil-to-Bukkit.patch index fedaaafd6f..c63cf43765 100644 --- a/patches/api/0003-Add-FastUtil-to-Bukkit.patch +++ b/patches/api/0003-Add-FastUtil-to-Bukkit.patch @@ -6,12 +6,12 @@ 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 c54be6e9df689433a8aa280541cf9366609a3c27..9fe78a9570f7e8dd4c6f94fc3fb1bf176c1481d2 100644 +index b1a33fdfd6495e5243315312aca97c2512a64dcc..2feb94aeb1eef2241963f6b541247d923913e560 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,6 +18,7 @@ dependencies { api("net.md-5:bungeecord-chat:1.16-R0.4") - api("org.yaml:snakeyaml:1.29") + api("org.yaml:snakeyaml:1.28") api("com.googlecode.json-simple:json-simple:1.1.1") // Paper + api("it.unimi.dsi:fastutil:8.2.2") diff --git a/patches/api/0006-Adventure.patch b/patches/api/0006-Adventure.patch index a648d8875b..fc40eb6aa0 100644 --- a/patches/api/0006-Adventure.patch +++ b/patches/api/0006-Adventure.patch @@ -7,11 +7,11 @@ Co-authored-by: zml Co-authored-by: Jake Potrebic diff --git a/build.gradle.kts b/build.gradle.kts -index 9fe78a9570f7e8dd4c6f94fc3fb1bf176c1481d2..3a36b2b7f38e3446177f0883083d30c739f6c9b1 100644 +index 2feb94aeb1eef2241963f6b541247d923913e560..19b55f2c25db81fc352a7ab973b2ca7fefbcb432 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -19,6 +19,11 @@ dependencies { - api("org.yaml:snakeyaml:1.29") + api("org.yaml:snakeyaml:1.28") api("com.googlecode.json-simple:json-simple:1.1.1") // Paper api("it.unimi.dsi:fastutil:8.2.2") + api(platform("net.kyori:adventure-bom:4.8.1"))