Merge branch '1.20.1' into 1.19.4

# Conflicts:
#	settings.gradle.kts

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/**")
         }
     }

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);

settings.gradle.kts

@@ -42,7 +42,7 @@ dependencyResolutionManagement {
 			library("balm-forge", "maven.modrinth:balm:6.0.2+forge-1.19.4")
 			library("fabric-waystones", "maven.modrinth:fwaystones:3.1.1+mc1.19.4")
 			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
 		}
 	}
 }