Merge pull request #12 from QuiltServerTools/feat/performance

README.md

@@ -28,6 +28,8 @@ url = ""
 username = ""
 password = ""
 properties = []
+maxPoolSize = 10
+connectionTimeout = 60000
 ```
 
 `url`: Must be URL of database with `/<database_name>` appended. An example URL would be `localhost/ledger`. You can optionally add port information such as `localhost:3000/ledger`
@@ -41,6 +43,15 @@ url = ""
 username = ""
 password = ""
 properties = []
+maxPoolSize = 10
+connectionTimeout = 60000
+```
+
+## SQLite
+
+```toml
+[database_extensions]
+database = "SQLITE"
 ```
 
 ## Connector properties

build.gradle

@@ -1,7 +1,7 @@
 plugins {
-	id 'fabric-loom' version '0.10-SNAPSHOT'
+	id 'fabric-loom' version '1.2.+'
 	id 'maven-publish'
-	id 'org.jetbrains.kotlin.jvm' version "1.6.0"
+	id 'org.jetbrains.kotlin.jvm' version "1.8.22"
 }
 
 sourceCompatibility = JavaVersion.VERSION_17
@@ -19,9 +19,6 @@ repositories {
 	maven {
 		url = "https://oss.sonatype.org/content/repositories/snapshots"
 	}
-	maven {
-		url = "https://maven.bymartrixx.me/"
-	}
 }
 
 dependencies {
@@ -30,22 +27,21 @@ dependencies {
 	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
-	// Fabric API. This is technically optional, but you probably want it anyway.
-	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-
 	// Yes this has to be capitalised
-	modImplementation "com.github.quiltservertools:ledger:1.2.0"
+	modImplementation "com.github.quiltservertools:Ledger:1.3.0+local"
 
-	modImplementation "net.fabricmc:fabric-language-kotlin:1.7.0+kotlin.1.6.0"
+	modImplementation "net.fabricmc:fabric-language-kotlin:1.9.4+kotlin.1.8.21"
+
+	implementation(include("com.zaxxer:HikariCP:5.0.1"))
 
 	// H2
-	implementation(include("com.h2database:h2:1.4.200"))
+	implementation(include("com.h2database:h2:2.2.224"))
 
 	// MySQL
-	implementation(include('mysql:mysql-connector-java:8.0.19'))
+	implementation(include('com.mysql:mysql-connector-j:8.3.0'))
 
 	// PostgreSQL
-	implementation(include("org.postgresql:postgresql:42.3.0"))
+	implementation(include("org.postgresql:postgresql:42.7.3"))
 }
 
 processResources {
@@ -79,7 +75,13 @@ jar {
 publishing {
 	publications {
 		mavenJava(MavenPublication) {
-			from(components["java"])
+			// add all the jars that should be included when publishing to maven
+			artifact(remapJar) {
+				builtBy remapJar
+			}
+			artifact(sourcesJar) {
+				builtBy remapSourcesJar
+			}
 		}
 	}
 

gradle.properties

@@ -1,16 +1,13 @@
 # Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
+org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/versions.html
-	minecraft_version=1.18.1
+	minecraft_version=1.19
-	yarn_mappings=1.18.1+build.2
+	yarn_mappings=1.19+build.4
-	loader_version=0.12.11
+	loader_version=0.14.8
 
 # Mod Properties
-	mod_version = 1.1.1
+	mod_version = 1.2.0
 	maven_group = net.quiltservertools
 	archives_base_name = ledger-databases
-
-# Dependencies
-	fabric_version=0.43.1+1.18

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
+#
-##  Gradle start up script for UN*X
+#   Gradle start up script for POSIX generated by Gradle.
-##
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
+app_path=$0
-# Need this for relative symlinks.
+
-while [ -h "$PRG" ] ; do
+# Need this for daisy-chained symlinks.
-    ls=`ls -ld "$PRG"`
+while
-    link=`expr "$ls" : '.*-> \(.*\)$'`
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    if expr "$link" : '/.*' > /dev/null; then
+    [ -h "$app_path" ]
-        PRG="$link"
+do
-    else
+    ls=$( ls -ld "$app_path" )
-        PRG=`dirname "$PRG"`"/$link"
+    link=${ls#*' -> '}
-    fi
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
+
-cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
+case "$( uname )" in                #(
-  CYGWIN* )
+  CYGWIN* )         cygwin=true  ;; #(
-    cygwin=true
+  Darwin* )         darwin=true  ;; #(
-    ;;
+  MSYS* | MINGW* )  msys=true    ;; #(
-  Darwin* )
+  NONSTOP* )        nonstop=true ;;
-    darwin=true
-    ;;
-  MSYS* | MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
+    case $MAX_FD in #(
-    if [ $? -eq 0 ] ; then
+      max*)
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+        MAX_FD=$( ulimit -H -n ) ||
-            MAX_FD="$MAX_FD_LIMIT"
+            warn "Could not query maximum file descriptor limit"
-        fi
+    esac
-        ulimit -n $MAX_FD
+    case $MAX_FD in  #(
-        if [ $? -ne 0 ] ; then
+      '' | soft) :;; #(
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
+      *)
-        fi
+        ulimit -n "$MAX_FD" ||
-    else
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
-# Escape application args
+# Collect all arguments for the java command, stacking in reverse order:
-save () {
+#   * args from the command line
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+#   * the main class name
-    echo " "
+#   * -classpath
-}
+#   * -D...appname settings
-APP_ARGS=`save "$@"`
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
+# For Cygwin or MSYS, switch paths to Windows format before running java
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"

src/main/kotlin/net/quiltservertools/ledger/databases/DatabaseExtensionSpec.kt

@@ -1,11 +1,13 @@
 package net.quiltservertools.ledger.databases
 
-import com.github.quiltservertools.libs.com.uchuhimo.konf.ConfigSpec
+import com.uchuhimo.konf.ConfigSpec
 
 object DatabaseExtensionSpec : ConfigSpec("database_extensions") {
-    val database by optional(Databases.SQLITE, "database")
+    val database by required<Databases>("database")
     val userName by optional("root", "username")
     val password by optional("", "password")
     val url by optional("localhost", "url")
-    val properties by optional(listOf<String>(), "properties")
+    val properties by optional(mapOf<String, String>(), "properties")
+    val maxPoolSize by optional(10, "maxPoolSize")
+    val connectionTimeout by optional(60000L, "connectionTimeout")
 }

src/main/kotlin/net/quiltservertools/ledger/databases/Databases.kt

@@ -1,10 +1,15 @@
 package net.quiltservertools.ledger.databases
 
-import net.quiltservertools.ledger.databases.databases.*
+import net.quiltservertools.ledger.databases.databases.H2Database
+import net.quiltservertools.ledger.databases.databases.LedgerDatabase
+import net.quiltservertools.ledger.databases.databases.MySQL
+import net.quiltservertools.ledger.databases.databases.PostgreSQL
+import net.quiltservertools.ledger.databases.databases.SQLite
+
 
 enum class Databases(val database: LedgerDatabase) {
-    SQLITE(SQLite),
     MYSQL(MySQL),
     H2(H2Database),
-    POSTGRESQL(PostgreSQL)
+    POSTGRESQL(PostgreSQL),
+    SQLITE(SQLite)
 }

src/main/kotlin/net/quiltservertools/ledger/databases/LedgerDatabaseExtension.kt

@@ -2,17 +2,18 @@ package net.quiltservertools.ledger.databases
 
 import com.github.quiltservertools.ledger.Ledger
 import com.github.quiltservertools.ledger.api.DatabaseExtension
-import com.github.quiltservertools.libs.com.uchuhimo.konf.ConfigSpec
+import com.uchuhimo.konf.ConfigSpec
-import net.minecraft.server.MinecraftServer
 import net.minecraft.util.Identifier
-import org.jetbrains.exposed.sql.Database
+import java.nio.file.Path
+import javax.sql.DataSource
 
 class LedgerDatabaseExtension : DatabaseExtension {
     override fun getConfigSpecs(): List<ConfigSpec> = listOf(DatabaseExtensionSpec)
 
-    override fun getDatabase(server: MinecraftServer): Database {
+    override fun getDataSource(savePath: Path): DataSource {
-        return Ledger.config[DatabaseExtensionSpec.database].database.getDatabase(server)
+        return Ledger.config[DatabaseExtensionSpec.database].database.getDataSource(savePath)
     }
 
-    override fun getIdentifier(): Identifier = Ledger.config[DatabaseExtensionSpec.database].database.getDatabaseIdentifier()
+    override fun getIdentifier(): Identifier = 
+        Ledger.config[DatabaseExtensionSpec.database].database.getDatabaseIdentifier()
 }

src/main/kotlin/net/quiltservertools/ledger/databases/LedgerDatabases.kt

@@ -2,9 +2,15 @@ package net.quiltservertools.ledger.databases
 
 import com.github.quiltservertools.ledger.api.ExtensionManager
 import net.fabricmc.api.DedicatedServerModInitializer
+import net.minecraft.util.Identifier
+
+const val MOD_ID = "ledger-databases"
+
+object LedgerDatabases : DedicatedServerModInitializer {
 
-class LedgerDatabases : DedicatedServerModInitializer {
     override fun onInitializeServer() {
         ExtensionManager.registerExtension(LedgerDatabaseExtension())
     }
+
+    fun identifier(path: String) = Identifier(MOD_ID, path)
 }

src/main/kotlin/net/quiltservertools/ledger/databases/databases/H2Database.kt

@@ -1,14 +1,15 @@
 package net.quiltservertools.ledger.databases.databases
 
-import com.github.quiltservertools.ledger.Ledger
+import net.quiltservertools.ledger.databases.LedgerDatabases
-import net.minecraft.server.MinecraftServer
+import org.h2.jdbcx.JdbcDataSource
-import net.minecraft.util.WorldSavePath
+import java.nio.file.Path
-import org.jetbrains.exposed.sql.Database
+import javax.sql.DataSource
+import kotlin.io.path.pathString
 
 object H2Database : LedgerDatabase {
-    override fun getDatabase(server: MinecraftServer) = Database.connect(
+    override fun getDataSource(savePath: Path): DataSource = JdbcDataSource().apply {
-        url = "jdbc:h2:${server.getSavePath(WorldSavePath.ROOT).resolve("ledger.h2").toFile()};MODE=MySQL"
+        setURL("jdbc:h2:${savePath.resolve("ledger.h2").pathString};MODE=MySQL")
-    )
+    }
-
+
-    override fun getDatabaseIdentifier() = Ledger.identifier("h2")
+    override fun getDatabaseIdentifier() = LedgerDatabases.identifier("h2")
 }

src/main/kotlin/net/quiltservertools/ledger/databases/databases/LedgerDatabase.kt

@@ -1,10 +1,10 @@
 package net.quiltservertools.ledger.databases.databases
 
-import net.minecraft.server.MinecraftServer
 import net.minecraft.util.Identifier
-import org.jetbrains.exposed.sql.Database
+import java.nio.file.Path
+import javax.sql.DataSource
 
 interface LedgerDatabase {
-    fun getDatabase(server: MinecraftServer): Database
+    fun getDataSource(savePath: Path): DataSource
     fun getDatabaseIdentifier(): Identifier
 }

src/main/kotlin/net/quiltservertools/ledger/databases/databases/MySQL.kt

@@ -1,22 +1,38 @@
 package net.quiltservertools.ledger.databases.databases
 
 import com.github.quiltservertools.ledger.Ledger
-import net.minecraft.server.MinecraftServer
+import com.zaxxer.hikari.HikariConfig
+import com.zaxxer.hikari.HikariDataSource
 import net.quiltservertools.ledger.databases.DatabaseExtensionSpec
-import org.jetbrains.exposed.sql.Database
+import net.quiltservertools.ledger.databases.LedgerDatabases
+import java.nio.file.Path
+import javax.sql.DataSource
 
 object MySQL : LedgerDatabase {
-    override fun getDatabase(server: MinecraftServer): Database {
+    override fun getDataSource(savePath: Path): DataSource = HikariDataSource(HikariConfig().apply {
-        var url = "jdbc:mysql://${Ledger.config[DatabaseExtensionSpec.url]}?rewriteBatchedStatements=true"
+        jdbcUrl = "jdbc:mysql://${Ledger.config[DatabaseExtensionSpec.url]}"
-        for (arg in Ledger.config[DatabaseExtensionSpec.properties]) {
+        username = Ledger.config[DatabaseExtensionSpec.userName]
-            url = url.plus("&$arg")
-        }
-        return Database.connect(
-            url = url,
-            user = Ledger.config[DatabaseExtensionSpec.userName],
         password = Ledger.config[DatabaseExtensionSpec.password]
-        )
+        maximumPoolSize = Ledger.config[DatabaseExtensionSpec.maxPoolSize]
+        connectionTimeout = Ledger.config[DatabaseExtensionSpec.connectionTimeout]
+        addDataSourceProperty("rewriteBatchedStatements", "true")
+        addDataSourceProperty("cachePrepStmts", true)
+        addDataSourceProperty("prepStmtCacheSize", 250)
+        addDataSourceProperty("prepStmtCacheSqlLimit", 2048)
+        addDataSourceProperty("useServerPrepStmts", true)
+        addDataSourceProperty("cacheCallableStmts", true)
+        addDataSourceProperty("cacheResultSetMetadata", true)
+        addDataSourceProperty("cacheServerConfiguration", true)
+        addDataSourceProperty("useLocalSessionState", true)
+        addDataSourceProperty("elideSetAutoCommits", true)
+        addDataSourceProperty("alwaysSendSetIsolation", false)
+        addDataSourceProperty("useJDBCCompliantTimezoneShift", true)
+        addDataSourceProperty("useLegacyDatetimeCode", false)
+        addDataSourceProperty("serverTimezone", "UTC")
+        for ((key, value) in Ledger.config[DatabaseExtensionSpec.properties]) {
+            addDataSourceProperty(key, value)
         }
+    })
 
-    override fun getDatabaseIdentifier() = Ledger.identifier("mysql")
+    override fun getDatabaseIdentifier() = LedgerDatabases.identifier("mysql")
 }

src/main/kotlin/net/quiltservertools/ledger/databases/databases/PostgreSQL.kt

@@ -1,22 +1,24 @@
 package net.quiltservertools.ledger.databases.databases
 
 import com.github.quiltservertools.ledger.Ledger
-import net.minecraft.server.MinecraftServer
+import com.zaxxer.hikari.HikariConfig
+import com.zaxxer.hikari.HikariDataSource
 import net.quiltservertools.ledger.databases.DatabaseExtensionSpec
-import org.jetbrains.exposed.sql.Database
+import net.quiltservertools.ledger.databases.LedgerDatabases
+import java.nio.file.Path
+import javax.sql.DataSource
 
 object PostgreSQL : LedgerDatabase {
-    override fun getDatabase(server: MinecraftServer): Database {
+    override fun getDataSource(savePath: Path): DataSource = HikariDataSource(HikariConfig().apply {
-        var url = "jdbc:postgresql://${Ledger.config[DatabaseExtensionSpec.url]}?rewriteBatchedStatements=true"
+        jdbcUrl = "jdbc:postgresql://${Ledger.config[DatabaseExtensionSpec.url]}"
-        for (arg in Ledger.config[DatabaseExtensionSpec.properties]) {
+        username = Ledger.config[DatabaseExtensionSpec.userName]
-            url = url.plus("&$arg")
-        }
-        return Database.connect(
-            url = url,
-            user = Ledger.config[DatabaseExtensionSpec.userName],
         password = Ledger.config[DatabaseExtensionSpec.password]
-        )
+        maximumPoolSize = Ledger.config[DatabaseExtensionSpec.maxPoolSize]
+        addDataSourceProperty("reWriteBatchedInserts", "true")
+        for ((key, value) in Ledger.config[DatabaseExtensionSpec.properties]) {
+            addDataSourceProperty(key, value)
         }
+    })
 
-    override fun getDatabaseIdentifier() = Ledger.identifier("postgresql")
+    override fun getDatabaseIdentifier() = LedgerDatabases.identifier("postgresql")
 }

src/main/kotlin/net/quiltservertools/ledger/databases/databases/SQLite.kt

@@ -1,15 +1,14 @@
 package net.quiltservertools.ledger.databases.databases
 
 import com.github.quiltservertools.ledger.Ledger
-import net.minecraft.server.MinecraftServer
+import org.sqlite.SQLiteDataSource
-import net.minecraft.util.WorldSavePath
+import java.nio.file.Path
-import org.jetbrains.exposed.sql.Database
 import kotlin.io.path.pathString
 
 object SQLite : LedgerDatabase {
-    override fun getDatabase(server: MinecraftServer) = Database.connect(
+    override fun getDataSource(savePath: Path) = SQLiteDataSource().apply {
-        url = "jdbc:sqlite:${server.getSavePath(WorldSavePath.ROOT).resolve("ledger.sqlite").pathString}"
+        url = "jdbc:sqlite:${savePath.resolve("ledger.sqlite").pathString}"
-    )
+    }
 
     override fun getDatabaseIdentifier() = Ledger.identifier(Ledger.DEFAULT_DATABASE)
 }

src/main/resources/fabric.mod.json

@@ -8,6 +8,10 @@
   "authors": [
     "yitzy299"
   ],
+  "contact": {
+    "homepage": "https://modrinth.com/project/ledger-databases",
+    "sources": "https://github.com/QuiltServerTools/Ledger-Databases"
+  },
 
   "license": "LGPL-3.0",
 
@@ -15,7 +19,7 @@
   "entrypoints": {
     "server": [
       {
-        "value": "net.quiltservertools.ledger.databases.LedgerDatabases"
+        "value": "net.quiltservertools.ledger.databases.LedgerDatabases::INSTANCE"
       }
     ]
   },
@@ -23,9 +27,8 @@
   "depends": {
     "fabricloader": ">=0.12.5",
     "fabric": "*",
-    "minecraft": ">=1.18",
     "java": ">=16",
-    "ledger": ">=1.2.0",
+    "ledger": ">=1.3.0",
     "fabric-language-kotlin": "*"
   }
 }