diff --git a/BlueMapCore/build.gradle.kts b/BlueMapCore/build.gradle.kts index 6bb776dd..17fa9c2b 100644 --- a/BlueMapCore/build.gradle.kts +++ b/BlueMapCore/build.gradle.kts @@ -56,7 +56,6 @@ repositories { @Suppress("GradlePackageUpdate") dependencies { - implementation("com.github.luben:zstd-jni:1.5.4-1") api ("com.github.ben-manes.caffeine:caffeine:2.8.5") api ("org.apache.commons:commons-lang3:3.6") api ("commons-io:commons-io:2.5") @@ -64,6 +63,7 @@ dependencies { api ("org.spongepowered:configurate-gson:4.1.2") api ("com.github.Querz:NBT:4.0") api ("org.apache.commons:commons-dbcp2:2.9.0") + api ("io.airlift:aircompressor:0.24") api ("de.bluecolored.bluemap.api:BlueMapAPI") diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/region/LinearRegion.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/region/LinearRegion.java index 75468f27..05d3cd98 100644 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/region/LinearRegion.java +++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/region/LinearRegion.java @@ -25,17 +25,20 @@ package de.bluecolored.bluemap.core.mca.region; import com.flowpowered.math.vector.Vector2i; -import com.github.luben.zstd.ZstdInputStream; import de.bluecolored.bluemap.core.logger.Logger; import de.bluecolored.bluemap.core.mca.MCAChunk; import de.bluecolored.bluemap.core.mca.MCAWorld; import de.bluecolored.bluemap.core.world.Chunk; import de.bluecolored.bluemap.core.world.EmptyChunk; import de.bluecolored.bluemap.core.world.Region; +import io.airlift.compress.zstd.ZstdInputStream; import net.querz.nbt.CompoundTag; import net.querz.nbt.Tag; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.DataInputStream; +import java.io.IOException; +import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; import java.util.*; diff --git a/implementations/cli/build.gradle.kts b/implementations/cli/build.gradle.kts index 93b9ceb2..19113b0e 100644 --- a/implementations/cli/build.gradle.kts +++ b/implementations/cli/build.gradle.kts @@ -86,6 +86,7 @@ tasks.shadowJar { relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework") relocate ("org.codehaus", "de.bluecolored.shadow.codehaus") relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref") + relocate ("io.airlift", "de.bluecolored.shadow.airlift") relocate ("org.apache.commons", "de.bluecolored.shadow.apache.commons") } diff --git a/implementations/fabric-1.15.2/build.gradle.kts b/implementations/fabric-1.15.2/build.gradle.kts index 9e6d7bd8..7e05cce5 100644 --- a/implementations/fabric-1.15.2/build.gradle.kts +++ b/implementations/fabric-1.15.2/build.gradle.kts @@ -114,6 +114,7 @@ tasks.shadowJar { relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework") relocate ("org.codehaus", "de.bluecolored.shadow.codehaus") relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref") + relocate ("io.airlift", "de.bluecolored.shadow.airlift") relocate ("com.google.errorprone", "de.bluecolored.shadow.google.errorprone") relocate ("com.google.inject", "de.bluecolored.shadow.google.inject") diff --git a/implementations/fabric-1.16.2/build.gradle.kts b/implementations/fabric-1.16.2/build.gradle.kts index 96222870..bd6195c5 100644 --- a/implementations/fabric-1.16.2/build.gradle.kts +++ b/implementations/fabric-1.16.2/build.gradle.kts @@ -114,6 +114,7 @@ tasks.shadowJar { relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework") relocate ("org.codehaus", "de.bluecolored.shadow.codehaus") relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref") + relocate ("io.airlift", "de.bluecolored.shadow.airlift") relocate ("com.google.errorprone", "de.bluecolored.shadow.google.errorprone") relocate ("com.google.inject", "de.bluecolored.shadow.google.inject") diff --git a/implementations/fabric-1.17/build.gradle.kts b/implementations/fabric-1.17/build.gradle.kts index b0bafe30..6a7b673e 100644 --- a/implementations/fabric-1.17/build.gradle.kts +++ b/implementations/fabric-1.17/build.gradle.kts @@ -114,6 +114,7 @@ tasks.shadowJar { relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework") relocate ("org.codehaus", "de.bluecolored.shadow.codehaus") relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref") + relocate ("io.airlift", "de.bluecolored.shadow.airlift") relocate ("com.google.errorprone", "de.bluecolored.shadow.google.errorprone") relocate ("com.google.inject", "de.bluecolored.shadow.google.inject") diff --git a/implementations/fabric-1.18/build.gradle.kts b/implementations/fabric-1.18/build.gradle.kts index f2f9f0e3..a3223451 100644 --- a/implementations/fabric-1.18/build.gradle.kts +++ b/implementations/fabric-1.18/build.gradle.kts @@ -114,6 +114,7 @@ tasks.shadowJar { relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework") relocate ("org.codehaus", "de.bluecolored.shadow.codehaus") relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref") + relocate ("io.airlift", "de.bluecolored.shadow.airlift") relocate ("com.google.errorprone", "de.bluecolored.shadow.google.errorprone") relocate ("com.google.inject", "de.bluecolored.shadow.google.inject") diff --git a/implementations/fabric-1.19.3/build.gradle.kts b/implementations/fabric-1.19.3/build.gradle.kts index 143246a1..aea68b09 100644 --- a/implementations/fabric-1.19.3/build.gradle.kts +++ b/implementations/fabric-1.19.3/build.gradle.kts @@ -114,6 +114,7 @@ tasks.shadowJar { relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework") relocate ("org.codehaus", "de.bluecolored.shadow.codehaus") relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref") + relocate ("io.airlift", "de.bluecolored.shadow.airlift") relocate ("com.google.errorprone", "de.bluecolored.shadow.google.errorprone") relocate ("com.google.inject", "de.bluecolored.shadow.google.inject") diff --git a/implementations/fabric-1.19.4/build.gradle.kts b/implementations/fabric-1.19.4/build.gradle.kts index 3772b8ff..385a398f 100644 --- a/implementations/fabric-1.19.4/build.gradle.kts +++ b/implementations/fabric-1.19.4/build.gradle.kts @@ -114,6 +114,7 @@ tasks.shadowJar { relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework") relocate ("org.codehaus", "de.bluecolored.shadow.codehaus") relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref") + relocate ("io.airlift", "de.bluecolored.shadow.airlift") relocate ("com.google.errorprone", "de.bluecolored.shadow.google.errorprone") relocate ("com.google.inject", "de.bluecolored.shadow.google.inject") diff --git a/implementations/fabric-1.19/build.gradle.kts b/implementations/fabric-1.19/build.gradle.kts index 50fb75b2..de21cafe 100644 --- a/implementations/fabric-1.19/build.gradle.kts +++ b/implementations/fabric-1.19/build.gradle.kts @@ -114,6 +114,7 @@ tasks.shadowJar { relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework") relocate ("org.codehaus", "de.bluecolored.shadow.codehaus") relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref") + relocate ("io.airlift", "de.bluecolored.shadow.airlift") relocate ("com.google.errorprone", "de.bluecolored.shadow.google.errorprone") relocate ("com.google.inject", "de.bluecolored.shadow.google.inject") diff --git a/implementations/folia/build.gradle.kts b/implementations/folia/build.gradle.kts index d14f6924..0400b8b8 100644 --- a/implementations/folia/build.gradle.kts +++ b/implementations/folia/build.gradle.kts @@ -98,6 +98,7 @@ tasks.shadowJar { relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework") relocate ("org.codehaus", "de.bluecolored.shadow.codehaus") relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref") + relocate ("io.airlift", "de.bluecolored.shadow.airlift") relocate ("com.google.errorprone", "de.bluecolored.shadow.google.errorprone") relocate ("com.google.inject", "de.bluecolored.shadow.google.inject") diff --git a/implementations/forge-1.16.5/build.gradle b/implementations/forge-1.16.5/build.gradle index 99df6284..42996947 100644 --- a/implementations/forge-1.16.5/build.gradle +++ b/implementations/forge-1.16.5/build.gradle @@ -136,6 +136,7 @@ shadowJar { relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework") relocate ("org.codehaus", "de.bluecolored.shadow.codehaus") relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref") + relocate ("io.airlift", "de.bluecolored.shadow.airlift") relocate ("com.google.errorprone", "de.bluecolored.shadow.google.errorprone") relocate ("com.google.inject", "de.bluecolored.shadow.google.inject") diff --git a/implementations/forge-1.17.1/build.gradle b/implementations/forge-1.17.1/build.gradle index 0d9d0ea5..6428b01e 100644 --- a/implementations/forge-1.17.1/build.gradle +++ b/implementations/forge-1.17.1/build.gradle @@ -136,6 +136,7 @@ shadowJar { relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework") relocate ("org.codehaus", "de.bluecolored.shadow.codehaus") relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref") + relocate ("io.airlift", "de.bluecolored.shadow.airlift") relocate ("com.google.errorprone", "de.bluecolored.shadow.google.errorprone") relocate ("com.google.inject", "de.bluecolored.shadow.google.inject") diff --git a/implementations/forge-1.18.1/build.gradle b/implementations/forge-1.18.1/build.gradle index 4e66ca13..8f394302 100644 --- a/implementations/forge-1.18.1/build.gradle +++ b/implementations/forge-1.18.1/build.gradle @@ -136,6 +136,7 @@ shadowJar { relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework") relocate ("org.codehaus", "de.bluecolored.shadow.codehaus") relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref") + relocate ("io.airlift", "de.bluecolored.shadow.airlift") relocate ("com.google.errorprone", "de.bluecolored.shadow.google.errorprone") relocate ("com.google.inject", "de.bluecolored.shadow.google.inject") diff --git a/implementations/forge-1.19.1/build.gradle b/implementations/forge-1.19.1/build.gradle index 9e071331..3c5c7e0e 100644 --- a/implementations/forge-1.19.1/build.gradle +++ b/implementations/forge-1.19.1/build.gradle @@ -137,6 +137,7 @@ shadowJar { relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework") relocate ("org.codehaus", "de.bluecolored.shadow.codehaus") relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref") + relocate ("io.airlift", "de.bluecolored.shadow.airlift") relocate ("com.google.errorprone", "de.bluecolored.shadow.google.errorprone") relocate ("com.google.inject", "de.bluecolored.shadow.google.inject") diff --git a/implementations/forge-1.19.3/build.gradle b/implementations/forge-1.19.3/build.gradle index 6e24c707..fa227e5c 100644 --- a/implementations/forge-1.19.3/build.gradle +++ b/implementations/forge-1.19.3/build.gradle @@ -136,6 +136,7 @@ shadowJar { relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework") relocate ("org.codehaus", "de.bluecolored.shadow.codehaus") relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref") + relocate ("io.airlift", "de.bluecolored.shadow.airlift") relocate ("com.google.errorprone", "de.bluecolored.shadow.google.errorprone") relocate ("com.google.inject", "de.bluecolored.shadow.google.inject") diff --git a/implementations/forge-1.19.4/build.gradle b/implementations/forge-1.19.4/build.gradle index b4501d84..7d12b06d 100644 --- a/implementations/forge-1.19.4/build.gradle +++ b/implementations/forge-1.19.4/build.gradle @@ -136,6 +136,7 @@ shadowJar { relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework") relocate ("org.codehaus", "de.bluecolored.shadow.codehaus") relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref") + relocate ("io.airlift", "de.bluecolored.shadow.airlift") relocate ("com.google.errorprone", "de.bluecolored.shadow.google.errorprone") relocate ("com.google.inject", "de.bluecolored.shadow.google.inject") diff --git a/implementations/spigot/build.gradle.kts b/implementations/spigot/build.gradle.kts index c6fcbc80..8a81eb4e 100644 --- a/implementations/spigot/build.gradle.kts +++ b/implementations/spigot/build.gradle.kts @@ -102,6 +102,7 @@ tasks.shadowJar { relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework") relocate ("org.codehaus", "de.bluecolored.shadow.codehaus") relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref") + relocate ("io.airlift", "de.bluecolored.shadow.airlift") relocate ("com.google.errorprone", "de.bluecolored.shadow.google.errorprone") relocate ("com.google.inject", "de.bluecolored.shadow.google.inject") diff --git a/implementations/sponge-8.0.0/build.gradle.kts b/implementations/sponge-8.0.0/build.gradle.kts index 30533c6d..d598fdf4 100644 --- a/implementations/sponge-8.0.0/build.gradle.kts +++ b/implementations/sponge-8.0.0/build.gradle.kts @@ -118,6 +118,7 @@ tasks.shadowJar { relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework") relocate ("org.codehaus", "de.bluecolored.shadow.codehaus") relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref") + relocate ("io.airlift", "de.bluecolored.shadow.airlift") relocate ("org.apache.commons.dbcp2", "de.bluecolored.shadow.apache.commons.dbcp2") relocate ("org.apache.commons.io", "de.bluecolored.shadow.apache.commons.io") diff --git a/implementations/sponge-9.0.0/build.gradle.kts b/implementations/sponge-9.0.0/build.gradle.kts index f9dcdebd..60d0645b 100644 --- a/implementations/sponge-9.0.0/build.gradle.kts +++ b/implementations/sponge-9.0.0/build.gradle.kts @@ -118,6 +118,7 @@ tasks.shadowJar { relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework") relocate ("org.codehaus", "de.bluecolored.shadow.codehaus") relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref") + relocate ("io.airlift", "de.bluecolored.shadow.airlift") relocate ("org.apache.commons.dbcp2", "de.bluecolored.shadow.apache.commons.dbcp2") relocate ("org.apache.commons.io", "de.bluecolored.shadow.apache.commons.io")