diff options
author | tylermurphy534 <tylerm@tylerm.dev> | 2023-07-30 22:13:49 +0000 |
---|---|---|
committer | tylermurphy534 <tylerm@tylerm.dev> | 2023-07-30 22:13:49 +0000 |
commit | a2ea5a635e1b841f58c05ca07e4b547a38fe3433 (patch) | |
tree | 5217465c967796680cc03b11359490f638d6b78c /src/main/java/dev/tylerm/khs/database/Database.java | |
parent | Update 'README.md' (diff) | |
parent | 1.7.5 rc4 (diff) | |
download | kenshinshideandseek-a2ea5a635e1b841f58c05ca07e4b547a38fe3433.tar.gz kenshinshideandseek-a2ea5a635e1b841f58c05ca07e4b547a38fe3433.tar.bz2 kenshinshideandseek-a2ea5a635e1b841f58c05ca07e4b547a38fe3433.zip |
Merge pull request '1.7.5' (#10) from dev into main
Reviewed-on: https://g.tylerm.dev/tylermurphy534/KenshinsHideAndSeek/pulls/10
Diffstat (limited to '')
-rw-r--r-- | src/main/java/dev/tylerm/khs/database/Database.java (renamed from src/main/java/net/tylermurphy/hideAndSeek/database/Database.java) | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/database/Database.java b/src/main/java/dev/tylerm/khs/database/Database.java index 58c13cc..42c4798 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/database/Database.java +++ b/src/main/java/dev/tylerm/khs/database/Database.java @@ -1,6 +1,4 @@ -package net.tylermurphy.hideAndSeek.database; - -import static net.tylermurphy.hideAndSeek.configuration.Config.databaseType; +package dev.tylerm.khs.database; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -13,10 +11,11 @@ import java.util.UUID; import com.google.common.io.ByteStreams; -import net.tylermurphy.hideAndSeek.Main; -import net.tylermurphy.hideAndSeek.database.connections.DatabaseConnection; -import net.tylermurphy.hideAndSeek.database.connections.MySQLConnection; -import net.tylermurphy.hideAndSeek.database.connections.SQLiteConnection; +import dev.tylerm.khs.Main; +import dev.tylerm.khs.configuration.Config; +import dev.tylerm.khs.database.connections.DatabaseConnection; +import dev.tylerm.khs.database.connections.MySQLConnection; +import dev.tylerm.khs.database.connections.SQLiteConnection; public class Database { @@ -27,14 +26,14 @@ public class Database { public Database(){ - if(databaseType.equalsIgnoreCase("SQLITE")) { + if(Config.databaseType.equalsIgnoreCase("SQLITE")) { Main.getInstance().getLogger().info("SQLITE database chosen"); connection = new SQLiteConnection(); - } else if(databaseType.equalsIgnoreCase("MYSQL")) { + } else if(Config.databaseType.equalsIgnoreCase("MYSQL")) { Main.getInstance().getLogger().info("MYSQL database chosen"); connection = new MySQLConnection(); } else { - throw new IllegalArgumentException("Invalid database type: " + databaseType); + throw new IllegalArgumentException("Invalid database type: " + Config.databaseType); } playerInfo = new GameDataTable(this); |