Embed xz stream (even if only used for dh importer)
This commit is contained in:
@@ -204,12 +204,11 @@ dependencies {
|
||||
include(implementation('org.rocksdb:rocksdbjni:8.10.0'))
|
||||
include(implementation 'org.apache.commons:commons-pool2:2.12.0')
|
||||
include(implementation 'org.lz4:lz4-java:1.8.0')
|
||||
compileOnly('org.tukaani:xz:1.10')
|
||||
include(implementation('org.tukaani:xz:1.10'))
|
||||
|
||||
if (true) {
|
||||
minecraftRuntimeLibraries('org.tukaani:xz:1.10')
|
||||
minecraftRuntimeLibraries('org.xerial:sqlite-jdbc:3.49.1.0')
|
||||
} else {
|
||||
include(implementation('org.tukaani:xz:1.10'))
|
||||
include(implementation('org.xerial:sqlite-jdbc:3.49.1.0'))
|
||||
}
|
||||
//implementation 'org.rocksdb:rocksdbjni:8.10.0'
|
||||
|
||||
@@ -45,14 +45,7 @@ public class VoxyCommands {
|
||||
.then(ClientCommandManager.literal("cancel")
|
||||
.executes(VoxyCommands::cancelImport));
|
||||
|
||||
boolean hasXZStream = true;
|
||||
try {
|
||||
Class.forName("org.tukaani.xz.XZInputStream");
|
||||
} catch (ClassNotFoundException | NoClassDefFoundError e) {
|
||||
hasXZStream = false;
|
||||
}
|
||||
|
||||
if (hasXZStream && DHImporter.HasRequiredLibraries) {
|
||||
if (DHImporter.HasRequiredLibraries) {
|
||||
imports = imports
|
||||
.then(ClientCommandManager.literal("distant_horizons")
|
||||
.then(ClientCommandManager.argument("sqlDbPath", StringArgumentType.string())
|
||||
|
||||
Reference in New Issue
Block a user