diff --git a/parent/build.gradle.kts b/parent/build.gradle.kts index 580c0c9..d776636 100644 --- a/parent/build.gradle.kts +++ b/parent/build.gradle.kts @@ -13,6 +13,7 @@ repositories { dependencies { implementation(kotlin("stdlib")) implementation(project(":common")) + implementation("com.zaxxer:HikariCP:4.0.3") @Suppress("VulnerableLibrariesLocal") compileOnly("io.github.waterfallmc:waterfall-api:1.19-R0.1-SNAPSHOT") } diff --git a/parent/src/main/kotlin/cc/maxmc/msm/parent/database/SQLDatabase.kt b/parent/src/main/kotlin/cc/maxmc/msm/parent/database/SQLDatabase.kt new file mode 100644 index 0000000..9883ed8 --- /dev/null +++ b/parent/src/main/kotlin/cc/maxmc/msm/parent/database/SQLDatabase.kt @@ -0,0 +1,23 @@ +package cc.maxmc.msm.parent.database + +import cc.maxmc.msm.parent.settings.Settings +import com.zaxxer.hikari.HikariConfig + +class SQLDatabase { + val config = HikariConfig() + fun initDatabase() { + val db = Settings.Database + config.jdbcUrl = "jdbc:mysql://${db.address}:${db.port}" + config.username = db.username + config.password = db.password + config.schema = db.database + } + + fun getMatch(id: Int) { + + } + + fun recordMatch() { + + } +} \ No newline at end of file diff --git a/parent/src/main/kotlin/cc/maxmc/msm/parent/settings/Settings.kt b/parent/src/main/kotlin/cc/maxmc/msm/parent/settings/Settings.kt index 82c5a37..b3be27a 100644 --- a/parent/src/main/kotlin/cc/maxmc/msm/parent/settings/Settings.kt +++ b/parent/src/main/kotlin/cc/maxmc/msm/parent/settings/Settings.kt @@ -3,8 +3,19 @@ package cc.maxmc.msm.parent.settings import cc.maxmc.msm.parent.settings.SettingsReader.config object Settings { - val name - get() = config val serverPort get() = config.getInt("server_port", 25566) + + object Database { + val address: String + get() = config.getString("database.address", "localhost") + val port: Int + get() = config.getInt("database.port", 12345) + val username: String + get() = config.getString("database.username", "root") + val password: String + get() = config.getString("database.password", "password") + val database: String + get() = config.getString("database.database", "multiserverman") + } } \ No newline at end of file diff --git a/parent/src/main/resources/settings.yml b/parent/src/main/resources/settings.yml index 4f36cc3..133a1df 100644 --- a/parent/src/main/resources/settings.yml +++ b/parent/src/main/resources/settings.yml @@ -1,3 +1,7 @@ -parent: +serverPort: 12345 +database: address: 127.0.0.1 - port: 23333 + port: 3306 + username: "root" + password: "password" + database: "multiserverman" \ No newline at end of file