mirror of
https://github.com/BlueMap-Minecraft/BlueMap.git
synced 2024-09-27 06:42:42 +02:00
Swap zstd library and relocate it correctly
This commit is contained in:
parent
92e5300c1e
commit
a31785e67e
@ -56,7 +56,6 @@ repositories {
|
|||||||
|
|
||||||
@Suppress("GradlePackageUpdate")
|
@Suppress("GradlePackageUpdate")
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation("com.github.luben:zstd-jni:1.5.4-1")
|
|
||||||
api ("com.github.ben-manes.caffeine:caffeine:2.8.5")
|
api ("com.github.ben-manes.caffeine:caffeine:2.8.5")
|
||||||
api ("org.apache.commons:commons-lang3:3.6")
|
api ("org.apache.commons:commons-lang3:3.6")
|
||||||
api ("commons-io:commons-io:2.5")
|
api ("commons-io:commons-io:2.5")
|
||||||
@ -64,6 +63,7 @@ dependencies {
|
|||||||
api ("org.spongepowered:configurate-gson:4.1.2")
|
api ("org.spongepowered:configurate-gson:4.1.2")
|
||||||
api ("com.github.Querz:NBT:4.0")
|
api ("com.github.Querz:NBT:4.0")
|
||||||
api ("org.apache.commons:commons-dbcp2:2.9.0")
|
api ("org.apache.commons:commons-dbcp2:2.9.0")
|
||||||
|
api ("io.airlift:aircompressor:0.24")
|
||||||
|
|
||||||
api ("de.bluecolored.bluemap.api:BlueMapAPI")
|
api ("de.bluecolored.bluemap.api:BlueMapAPI")
|
||||||
|
|
||||||
|
@ -25,17 +25,20 @@
|
|||||||
package de.bluecolored.bluemap.core.mca.region;
|
package de.bluecolored.bluemap.core.mca.region;
|
||||||
|
|
||||||
import com.flowpowered.math.vector.Vector2i;
|
import com.flowpowered.math.vector.Vector2i;
|
||||||
import com.github.luben.zstd.ZstdInputStream;
|
|
||||||
import de.bluecolored.bluemap.core.logger.Logger;
|
import de.bluecolored.bluemap.core.logger.Logger;
|
||||||
import de.bluecolored.bluemap.core.mca.MCAChunk;
|
import de.bluecolored.bluemap.core.mca.MCAChunk;
|
||||||
import de.bluecolored.bluemap.core.mca.MCAWorld;
|
import de.bluecolored.bluemap.core.mca.MCAWorld;
|
||||||
import de.bluecolored.bluemap.core.world.Chunk;
|
import de.bluecolored.bluemap.core.world.Chunk;
|
||||||
import de.bluecolored.bluemap.core.world.EmptyChunk;
|
import de.bluecolored.bluemap.core.world.EmptyChunk;
|
||||||
import de.bluecolored.bluemap.core.world.Region;
|
import de.bluecolored.bluemap.core.world.Region;
|
||||||
|
import io.airlift.compress.zstd.ZstdInputStream;
|
||||||
import net.querz.nbt.CompoundTag;
|
import net.querz.nbt.CompoundTag;
|
||||||
import net.querz.nbt.Tag;
|
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.Files;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
@ -86,6 +86,7 @@ tasks.shadowJar {
|
|||||||
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
||||||
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
||||||
relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref")
|
relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref")
|
||||||
|
relocate ("io.airlift", "de.bluecolored.shadow.airlift")
|
||||||
relocate ("org.apache.commons", "de.bluecolored.shadow.apache.commons")
|
relocate ("org.apache.commons", "de.bluecolored.shadow.apache.commons")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -114,6 +114,7 @@ tasks.shadowJar {
|
|||||||
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
||||||
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
||||||
relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref")
|
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.errorprone", "de.bluecolored.shadow.google.errorprone")
|
||||||
relocate ("com.google.inject", "de.bluecolored.shadow.google.inject")
|
relocate ("com.google.inject", "de.bluecolored.shadow.google.inject")
|
||||||
|
@ -114,6 +114,7 @@ tasks.shadowJar {
|
|||||||
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
||||||
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
||||||
relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref")
|
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.errorprone", "de.bluecolored.shadow.google.errorprone")
|
||||||
relocate ("com.google.inject", "de.bluecolored.shadow.google.inject")
|
relocate ("com.google.inject", "de.bluecolored.shadow.google.inject")
|
||||||
|
@ -114,6 +114,7 @@ tasks.shadowJar {
|
|||||||
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
||||||
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
||||||
relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref")
|
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.errorprone", "de.bluecolored.shadow.google.errorprone")
|
||||||
relocate ("com.google.inject", "de.bluecolored.shadow.google.inject")
|
relocate ("com.google.inject", "de.bluecolored.shadow.google.inject")
|
||||||
|
@ -114,6 +114,7 @@ tasks.shadowJar {
|
|||||||
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
||||||
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
||||||
relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref")
|
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.errorprone", "de.bluecolored.shadow.google.errorprone")
|
||||||
relocate ("com.google.inject", "de.bluecolored.shadow.google.inject")
|
relocate ("com.google.inject", "de.bluecolored.shadow.google.inject")
|
||||||
|
@ -114,6 +114,7 @@ tasks.shadowJar {
|
|||||||
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
||||||
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
||||||
relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref")
|
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.errorprone", "de.bluecolored.shadow.google.errorprone")
|
||||||
relocate ("com.google.inject", "de.bluecolored.shadow.google.inject")
|
relocate ("com.google.inject", "de.bluecolored.shadow.google.inject")
|
||||||
|
@ -114,6 +114,7 @@ tasks.shadowJar {
|
|||||||
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
||||||
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
||||||
relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref")
|
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.errorprone", "de.bluecolored.shadow.google.errorprone")
|
||||||
relocate ("com.google.inject", "de.bluecolored.shadow.google.inject")
|
relocate ("com.google.inject", "de.bluecolored.shadow.google.inject")
|
||||||
|
@ -114,6 +114,7 @@ tasks.shadowJar {
|
|||||||
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
||||||
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
||||||
relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref")
|
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.errorprone", "de.bluecolored.shadow.google.errorprone")
|
||||||
relocate ("com.google.inject", "de.bluecolored.shadow.google.inject")
|
relocate ("com.google.inject", "de.bluecolored.shadow.google.inject")
|
||||||
|
@ -98,6 +98,7 @@ tasks.shadowJar {
|
|||||||
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
||||||
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
||||||
relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref")
|
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.errorprone", "de.bluecolored.shadow.google.errorprone")
|
||||||
relocate ("com.google.inject", "de.bluecolored.shadow.google.inject")
|
relocate ("com.google.inject", "de.bluecolored.shadow.google.inject")
|
||||||
|
@ -136,6 +136,7 @@ shadowJar {
|
|||||||
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
||||||
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
||||||
relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref")
|
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.errorprone", "de.bluecolored.shadow.google.errorprone")
|
||||||
relocate ("com.google.inject", "de.bluecolored.shadow.google.inject")
|
relocate ("com.google.inject", "de.bluecolored.shadow.google.inject")
|
||||||
|
@ -136,6 +136,7 @@ shadowJar {
|
|||||||
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
||||||
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
||||||
relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref")
|
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.errorprone", "de.bluecolored.shadow.google.errorprone")
|
||||||
relocate ("com.google.inject", "de.bluecolored.shadow.google.inject")
|
relocate ("com.google.inject", "de.bluecolored.shadow.google.inject")
|
||||||
|
@ -136,6 +136,7 @@ shadowJar {
|
|||||||
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
||||||
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
||||||
relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref")
|
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.errorprone", "de.bluecolored.shadow.google.errorprone")
|
||||||
relocate ("com.google.inject", "de.bluecolored.shadow.google.inject")
|
relocate ("com.google.inject", "de.bluecolored.shadow.google.inject")
|
||||||
|
@ -137,6 +137,7 @@ shadowJar {
|
|||||||
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
||||||
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
||||||
relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref")
|
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.errorprone", "de.bluecolored.shadow.google.errorprone")
|
||||||
relocate ("com.google.inject", "de.bluecolored.shadow.google.inject")
|
relocate ("com.google.inject", "de.bluecolored.shadow.google.inject")
|
||||||
|
@ -136,6 +136,7 @@ shadowJar {
|
|||||||
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
||||||
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
||||||
relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref")
|
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.errorprone", "de.bluecolored.shadow.google.errorprone")
|
||||||
relocate ("com.google.inject", "de.bluecolored.shadow.google.inject")
|
relocate ("com.google.inject", "de.bluecolored.shadow.google.inject")
|
||||||
|
@ -136,6 +136,7 @@ shadowJar {
|
|||||||
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
||||||
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
||||||
relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref")
|
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.errorprone", "de.bluecolored.shadow.google.errorprone")
|
||||||
relocate ("com.google.inject", "de.bluecolored.shadow.google.inject")
|
relocate ("com.google.inject", "de.bluecolored.shadow.google.inject")
|
||||||
|
@ -102,6 +102,7 @@ tasks.shadowJar {
|
|||||||
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
||||||
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
||||||
relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref")
|
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.errorprone", "de.bluecolored.shadow.google.errorprone")
|
||||||
relocate ("com.google.inject", "de.bluecolored.shadow.google.inject")
|
relocate ("com.google.inject", "de.bluecolored.shadow.google.inject")
|
||||||
|
@ -118,6 +118,7 @@ tasks.shadowJar {
|
|||||||
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
||||||
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
||||||
relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref")
|
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.dbcp2", "de.bluecolored.shadow.apache.commons.dbcp2")
|
||||||
relocate ("org.apache.commons.io", "de.bluecolored.shadow.apache.commons.io")
|
relocate ("org.apache.commons.io", "de.bluecolored.shadow.apache.commons.io")
|
||||||
|
@ -118,6 +118,7 @@ tasks.shadowJar {
|
|||||||
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
||||||
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
||||||
relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref")
|
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.dbcp2", "de.bluecolored.shadow.apache.commons.dbcp2")
|
||||||
relocate ("org.apache.commons.io", "de.bluecolored.shadow.apache.commons.io")
|
relocate ("org.apache.commons.io", "de.bluecolored.shadow.apache.commons.io")
|
||||||
|
Loading…
Reference in New Issue
Block a user