From 623e14a5594a4378969a09e0b9975af07b01323e Mon Sep 17 00:00:00 2001
From: SirYwell <hannesgreule@outlook.de>
Date: Tue, 21 Nov 2023 15:56:29 +0100
Subject: [PATCH] Use spigot library feature for ZSTD

---
 .github/renovate.json                          | 1 -
 gradle/libs.versions.toml                      | 2 +-
 worldedit-bukkit/build.gradle.kts              | 3 ---
 worldedit-bukkit/src/main/resources/plugin.yml | 2 ++
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/renovate.json b/.github/renovate.json
index d0e59d791..74de2ba63 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -18,7 +18,6 @@
     "com.google.code.gson:gson",
     "net.fabricmc:fabric-loader",
     "net.fabricmc.fabric-api:fabric-api",
-    "com.github.luben:zstd-jni",
     "org.jetbrains.kotlin.jvm",
     "log4j",
     "org.apache.logging.log4j:log4j-api",
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 397834962..c0ac41437 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -28,7 +28,7 @@ truezip = "6.8.4"
 auto-value = "1.10.4"
 findbugs = "3.0.2"
 rhino-runtime = "1.7.14"
-zstd-jni = "1.4.8-1" # Not latest as it can be difficult to obtain latest ZSTD libs
+zstd-jni = "1.5.5-10"
 antlr4 = "4.13.1"
 json-simple = "1.1.1"
 jlibnoise = "1.0.0"
diff --git a/worldedit-bukkit/build.gradle.kts b/worldedit-bukkit/build.gradle.kts
index ead334bf4..cc818d035 100644
--- a/worldedit-bukkit/build.gradle.kts
+++ b/worldedit-bukkit/build.gradle.kts
@@ -161,9 +161,6 @@ tasks.named<ShadowJar>("shadowJar") {
         // If it turns out not to be true for Spigot/Paper, our only two official platforms, this can be uncommented.
         // include(dependency("org.apache.logging.log4j:log4j-api"))
         include(dependency("org.antlr:antlr4-runtime"))
-        // ZSTD does not work if relocated. https://github.com/luben/zstd-jni/issues/189 Use not latest as it can be difficult
-        // to obtain latest ZSTD lib
-        include(dependency("com.github.luben:zstd-jni:1.4.8-1"))
         relocate("org.bstats", "com.sk89q.worldedit.bstats") {
             include(dependency("org.bstats:"))
         }
diff --git a/worldedit-bukkit/src/main/resources/plugin.yml b/worldedit-bukkit/src/main/resources/plugin.yml
index b4f845265..0d9d37111 100644
--- a/worldedit-bukkit/src/main/resources/plugin.yml
+++ b/worldedit-bukkit/src/main/resources/plugin.yml
@@ -10,6 +10,8 @@ description: Blazingly fast world manipulation for builders, large networks and
 authors: [ Empire92, MattBDev, IronApollo, dordsor21, NotMyFault ]
 loadbefore: [ WorldGuard, PlotSquared ]
 database: false
+libraries:
+- "com.github.luben:zstd-jni:1.5.5-10"
 permissions:
   fawe.plotsquared:
     default: true