From b00223a35152a98ecf00e5a0ee1bdb07b084327b Mon Sep 17 00:00:00 2001 From: mcrcortex <18544518+MCRcortex@users.noreply.github.com> Date: Sun, 20 Apr 2025 21:13:07 +1000 Subject: [PATCH] Embed xz stream (even if only used for dh importer) --- build.gradle | 5 ++--- src/main/java/me/cortex/voxy/client/VoxyCommands.java | 9 +-------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 8ea48579..1e41ae7f 100644 --- a/build.gradle +++ b/build.gradle @@ -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' diff --git a/src/main/java/me/cortex/voxy/client/VoxyCommands.java b/src/main/java/me/cortex/voxy/client/VoxyCommands.java index a7c34a6f..7edaf22d 100644 --- a/src/main/java/me/cortex/voxy/client/VoxyCommands.java +++ b/src/main/java/me/cortex/voxy/client/VoxyCommands.java @@ -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())