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

Conditionally add DH import command

Browse Source
This commit is contained in:
mcrcortex
2025-04-18 20:51:54 +10:00
parent 432d078212
commit 3b2614631d
3 changed files with 43 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
build.gradle
View File

@@ -211,8 +211,13 @@ dependencies {
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') compileOnly('org.tukaani:xz:1.10')
minecraftRuntimeLibraries('org.tukaani:xz:1.10') if (true) {
minecraftRuntimeLibraries('org.xerial:sqlite-jdbc:3.49.1.0') 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' //implementation 'org.rocksdb:rocksdbjni:8.10.0'
//implementation 'redis.clients:jedis:5.1.0' //implementation 'redis.clients:jedis:5.1.0'
} }

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

@@ -25,32 +25,37 @@ import java.util.concurrent.CompletableFuture;
public class VoxyCommands { public class VoxyCommands {
public static LiteralArgumentBuilder<FabricClientCommandSource> register() { public static LiteralArgumentBuilder<FabricClientCommandSource> register() {
var imports = ClientCommandManager.literal("import")
.then(ClientCommandManager.literal("world")
.then(ClientCommandManager.argument("world_name", StringArgumentType.string())
.suggests(VoxyCommands::importWorldSuggester)
.executes(VoxyCommands::importWorld)))
.then(ClientCommandManager.literal("bobby")
.then(ClientCommandManager.argument("world_name", StringArgumentType.string())
.suggests(VoxyCommands::importBobbySuggester)
.executes(VoxyCommands::importBobby)))
.then(ClientCommandManager.literal("raw")
.then(ClientCommandManager.argument("path", StringArgumentType.string())
.executes(VoxyCommands::importRaw)))
.then(ClientCommandManager.literal("zip")
.then(ClientCommandManager.argument("zipPath", StringArgumentType.string())
.executes(VoxyCommands::importZip)
.then(ClientCommandManager.argument("innerPath", StringArgumentType.string())
.executes(VoxyCommands::importZip))))
.then(ClientCommandManager.literal("cancel")
.executes(VoxyCommands::cancelImport));
if (DHImporter.HasRequiredLibraries) {
imports = imports
.then(ClientCommandManager.literal("distant_horizons")
.then(ClientCommandManager.argument("sqlDbPath", StringArgumentType.string())
.executes(VoxyCommands::importDistantHorizons)));
}
return ClientCommandManager.literal("voxy").requires((ctx)-> VoxyCommon.getInstance() != null) return ClientCommandManager.literal("voxy").requires((ctx)-> VoxyCommon.getInstance() != null)
.then(ClientCommandManager.literal("reload") .then(ClientCommandManager.literal("reload")
.executes(VoxyCommands::reloadInstance)) .executes(VoxyCommands::reloadInstance))
.then(ClientCommandManager.literal("import") .then(imports);
.then(ClientCommandManager.literal("world")
.then(ClientCommandManager.argument("world_name", StringArgumentType.string())
.suggests(VoxyCommands::importWorldSuggester)
.executes(VoxyCommands::importWorld)))
.then(ClientCommandManager.literal("bobby")
.then(ClientCommandManager.argument("world_name", StringArgumentType.string())
.suggests(VoxyCommands::importBobbySuggester)
.executes(VoxyCommands::importBobby)))
.then(ClientCommandManager.literal("raw")
.then(ClientCommandManager.argument("path", StringArgumentType.string())
.executes(VoxyCommands::importRaw)))
.then(ClientCommandManager.literal("zip")
.then(ClientCommandManager.argument("zipPath", StringArgumentType.string())
.executes(VoxyCommands::importZip)
.then(ClientCommandManager.argument("innerPath", StringArgumentType.string())
.executes(VoxyCommands::importZip))))
.then(ClientCommandManager.literal("distant_horizons")
.then(ClientCommandManager.argument("sqlDbPath", StringArgumentType.string())
.executes(VoxyCommands::importDistantHorizons)))
.then(ClientCommandManager.literal("cancel")
.executes(VoxyCommands::cancelImport))
);
} }
private static int reloadInstance(CommandContext<FabricClientCommandSource> ctx) { private static int reloadInstance(CommandContext<FabricClientCommandSource> ctx) {

9
src/main/java/me/cortex/voxy/commonImpl/importers/DHImporter.java
View File

@@ -376,13 +376,20 @@ public class DHImporter implements IDataImporter {
private static VarHandle create(Class<?> viewArrayClass) { private static VarHandle create(Class<?> viewArrayClass) {
return MethodHandles.byteArrayViewVarHandle(viewArrayClass, ByteOrder.BIG_ENDIAN); return MethodHandles.byteArrayViewVarHandle(viewArrayClass, ByteOrder.BIG_ENDIAN);
} }
public static final boolean HasRequiredLibraries;
private static final VarHandle LONG = create(long[].class); private static final VarHandle LONG = create(long[].class);
static { static {
boolean hasJDBC = false;
try { try {
Class.forName("org.sqlite.JDBC"); Class.forName("org.sqlite.JDBC");
hasJDBC = true;
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {
throw new RuntimeException(e); //throw new RuntimeException(e);
Logger.error("Unable to load sqlite JDBC, DHImporting wont be available", e);
} }
HasRequiredLibraries = hasJDBC;
} }
} }