diff --git a/src/main/java/net/coreprotect/config/Config.java b/src/main/java/net/coreprotect/config/Config.java index 0d2492414..e1d3f1a88 100644 --- a/src/main/java/net/coreprotect/config/Config.java +++ b/src/main/java/net/coreprotect/config/Config.java @@ -37,13 +37,7 @@ public class Config extends Language { private Config defaults; public String DONATION_KEY; - public String DATABASE_TYPE; - public String CLICKHOUSE_HOST; - public String CLICKHOUSE_DATABASE; - public String CLICKHOUSE_USERNAME; - public String CLICKHOUSE_PASSWORD; - public String DUCKDB_MEMORY_LIMIT; - public String DUCKDB_MAX_TEMP_DIRECTORY_SIZE; + public String SQLITE_DATABASE; public String PREFIX; public String MYSQL_HOST; public String MYSQL_DATABASE; @@ -238,13 +232,7 @@ private void readValues() { this.UNKNOWN_LOGGING = this.getBoolean("unknown-logging", false); this.MAXIMUM_POOL_SIZE = this.getInt("maximum-pool-size", 10); this.DONATION_KEY = this.getString("donation-key"); - this.DATABASE_TYPE = this.getString("database-type"); - this.CLICKHOUSE_HOST = this.getString("clickhouse-host"); - this.CLICKHOUSE_PORT = this.getInt("clickhouse-port"); - this.CLICKHOUSE_DATABASE = this.getString("clickhouse-database"); - this.CLICKHOUSE_USERNAME = this.getString("clickhouse-username"); - this.CLICKHOUSE_PASSWORD = this.getString("clickhouse-password"); - this.CLICKHOUSE_TLS = this.getBoolean("clickhouse-tls"); + this.SQLITE_DATABASE = this.getString("sqlite-database"); this.MYSQL = this.getBoolean("use-mysql"); this.PREFIX = this.getString("table-prefix"); this.MYSQL_HOST = this.getString("mysql-host"); diff --git a/src/main/java/net/coreprotect/config/ConfigHandler.java b/src/main/java/net/coreprotect/config/ConfigHandler.java index c20c3bf97..ab51c2481 100644 --- a/src/main/java/net/coreprotect/config/ConfigHandler.java +++ b/src/main/java/net/coreprotect/config/ConfigHandler.java @@ -323,8 +323,17 @@ private static void loadConfig() throws Exception { if (global.hasOption("use-mysql") && global.MYSQL != ConfigHandler.databaseType.isMySQL()) { Chat.sendConsoleMessage(Color.YELLOW + "[CoreProtect] " + Phrase.build(Phrase.DATABASE_TYPE_OVERRIDE)); } - } else { - ConfigHandler.databaseType = global.MYSQL ? DatabaseType.MYSQL : DatabaseType.SQLITE; + + ConfigHandler.host = Config.getGlobal().MYSQL_HOST; + ConfigHandler.port = Config.getGlobal().MYSQL_PORT; + ConfigHandler.database = Config.getGlobal().MYSQL_DATABASE; + ConfigHandler.username = Config.getGlobal().MYSQL_USERNAME; + ConfigHandler.password = Config.getGlobal().MYSQL_PASSWORD; + ConfigHandler.maximumPoolSize = Config.getGlobal().MAXIMUM_POOL_SIZE; + ConfigHandler.prefix = Config.getGlobal().PREFIX; + ConfigHandler.sqlite = Config.getGlobal().SQLITE_DATABASE.trim().length() > 0 ? Config.getGlobal().SQLITE_DATABASE.trim() : "database.db"; + + ConfigHandler.loadBlacklist(); // Load the blacklist file if it exists. } global.MYSQL = ConfigHandler.databaseType.isMySQL();