From 752e8a2f36fdc6c317217254c34960940db9baae Mon Sep 17 00:00:00 2001 From: rfresh2 <89827146+rfresh2@users.noreply.github.com> Date: Tue, 19 Mar 2024 23:41:35 -0700 Subject: [PATCH] relocate sqlite to avoid DH forge classloader conflict --- build.gradle.kts | 24 +++++++++---------- .../highlights/ChunkHighlightDatabase.java | 2 +- settings.gradle.kts | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index e11fb797..40928339 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -42,18 +42,18 @@ subprojects { exclude("com/google/**") exclude("org/objectweb/**") exclude("org/checkerframework/**") - exclude("org/sqlite/native/FreeBSD/**") - exclude("org/sqlite/native/Linux-Android/**") - exclude("org/sqlite/native/Linux-Musl/**") - exclude("org/sqlite/native/Linux/arm/**") - exclude("org/sqlite/native/Linux/aarch64/**") - exclude("org/sqlite/native/Linux/armv6/**") - exclude("org/sqlite/native/Linux/x86/**") - exclude("org/sqlite/native/Linux/armv7/**") - exclude("org/sqlite/native/Linux/ppc64/**") - exclude("org/sqlite/native/Windows/armv7/**") - exclude("org/sqlite/native/Windows/aarch64/**") - exclude("org/sqlite/native/Windows/armv7/**") + exclude("org/rfresh/sqlite/native/FreeBSD/**") + exclude("org/rfresh/sqlite/native/Linux-Android/**") + exclude("org/rfresh/sqlite/native/Linux-Musl/**") + exclude("org/rfresh/sqlite/native/Linux/arm/**") + exclude("org/rfresh/sqlite/native/Linux/aarch64/**") + exclude("org/rfresh/sqlite/native/Linux/armv6/**") + exclude("org/rfresh/sqlite/native/Linux/x86/**") + exclude("org/rfresh/sqlite/native/Linux/armv7/**") + exclude("org/rfresh/sqlite/native/Linux/ppc64/**") + exclude("org/rfresh/sqlite/native/Windows/armv7/**") + exclude("org/rfresh/sqlite/native/Windows/aarch64/**") + exclude("org/rfresh/sqlite/native/Windows/armv7/**") exclude("org/slf4j/**") } } diff --git a/common/src/main/java/xaeroplus/feature/render/highlights/ChunkHighlightDatabase.java b/common/src/main/java/xaeroplus/feature/render/highlights/ChunkHighlightDatabase.java index 1c6d04ef..17bedabc 100644 --- a/common/src/main/java/xaeroplus/feature/render/highlights/ChunkHighlightDatabase.java +++ b/common/src/main/java/xaeroplus/feature/render/highlights/ChunkHighlightDatabase.java @@ -25,7 +25,7 @@ public ChunkHighlightDatabase(String worldId, String databaseName) { this.databaseName = databaseName; try { final Path dbPath = WorldMap.saveFolder.toPath().resolve(worldId).resolve(databaseName + ".db"); - connection = DriverManager.getConnection("jdbc:sqlite:" + dbPath); + connection = DriverManager.getConnection("jdbc:rfresh_sqlite:" + dbPath); createHighlightsTables(); } catch (Exception e) { XaeroPlus.LOGGER.error("Error while creating chunk highlight database: {}", databaseName, e); diff --git a/settings.gradle.kts b/settings.gradle.kts index 75dd9950..08a995f1 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -42,7 +42,7 @@ dependencyResolutionManagement { library("balm-forge", "maven.modrinth:balm:7.1.4+forge-1.20.1") library("fabric-waystones", "maven.modrinth:fwaystones:3.1.3+mc1.20") library("worldtools", "maven.modrinth:worldtools:1.2.0+1.20.1") - library("sqlite", "org.xerial:sqlite-jdbc:3.45.1.0") + library("sqlite", "com.github.rfresh2:sqlite-jdbc:2ba0c66439") // relocated xerial sqlite to avoid conflicts with other mods library("immediatelyfast", "maven.modrinth:immediatelyfast:1.2.10+1.20.4-fabric") library("modmenu", "maven.modrinth:modmenu:7.2.2") library("sodium", "maven.modrinth:sodium:mc1.20.1-0.5.3")