spdis/voxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Embed xz stream (even if only used for dh importer)

Browse Source
This commit is contained in:
mcrcortex
2025-04-20 21:13:07 +10:00
parent c81a1d015e
commit b00223a351
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build.gradle
View File

@@ -204,12 +204,11 @@ dependencies {
include(implementation('org.rocksdb:rocksdbjni:8.10.0')) include(implementation('org.rocksdb:rocksdbjni:8.10.0'))
include(implementation 'org.apache.commons:commons-pool2:2.12.0') include(implementation 'org.apache.commons:commons-pool2:2.12.0')
include(implementation 'org.lz4:lz4-java:1.8.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) { if (true) {
minecraftRuntimeLibraries('org.tukaani:xz:1.10')
minecraftRuntimeLibraries('org.xerial:sqlite-jdbc:3.49.1.0') minecraftRuntimeLibraries('org.xerial:sqlite-jdbc:3.49.1.0')
} else { } else {
include(implementation('org.tukaani:xz:1.10'))
include(implementation('org.xerial:sqlite-jdbc:3.49.1.0')) include(implementation('org.xerial:sqlite-jdbc:3.49.1.0'))
} }
//implementation 'org.rocksdb:rocksdbjni:8.10.0' //implementation 'org.rocksdb:rocksdbjni:8.10.0'

9
src/main/java/me/cortex/voxy/client/VoxyCommands.java
View File

@@ -45,14 +45,7 @@ public class VoxyCommands {
.then(ClientCommandManager.literal("cancel") .then(ClientCommandManager.literal("cancel")
.executes(VoxyCommands::cancelImport)); .executes(VoxyCommands::cancelImport));
boolean hasXZStream = true; if (DHImporter.HasRequiredLibraries) {
try {
Class.forName("org.tukaani.xz.XZInputStream");
} catch (ClassNotFoundException | NoClassDefFoundError e) {
hasXZStream = false;
}
if (hasXZStream && DHImporter.HasRequiredLibraries) {
imports = imports imports = imports
.then(ClientCommandManager.literal("distant_horizons") .then(ClientCommandManager.literal("distant_horizons")
.then(ClientCommandManager.argument("sqlDbPath", StringArgumentType.string()) .then(ClientCommandManager.argument("sqlDbPath", StringArgumentType.string())