Fix ZSTD implementation and test-loading. Don't allow disabling of the test on startup

This commit is contained in:
dordsor21
2021-09-17 14:38:28 +01:00
parent 9fb6ebe7ac
commit 74697ee312
4 changed files with 124 additions and 132 deletions

View File

@ -147,6 +147,9 @@ 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:"))
}
@ -162,9 +165,6 @@ tasks.named<ShadowJar>("shadowJar") {
relocate("com.intellectualsites.paster", "com.fastasyncworldedit.paster") {
include(dependency("com.intellectualsites.paster:Paster:1.1.1"))
}
relocate("com.github.luben", "com.fastasyncworldedit.core.zstd") {
include(dependency("com.github.luben:zstd-jni:1.5.0-4"))
}
relocate("net.jpountz", "com.fastasyncworldedit.core.jpountz") {
include(dependency("net.jpountz:lz4-java-stream:1.0.0"))
}