10 files changed, 35 insertions, 37 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);
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/database/GameDataTable.java b/src/main/java/dev/tylerm/khs/database/GameDataTable.java
index d5fe7e6..ed54baa 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/database/GameDataTable.java
+++ b/src/main/java/dev/tylerm/khs/database/GameDataTable.java
@@ -17,12 +17,12 @@
  *
  */
 
-package net.tylermurphy.hideAndSeek.database;
+package dev.tylerm.khs.database;
 
-import net.tylermurphy.hideAndSeek.Main;
-import net.tylermurphy.hideAndSeek.database.util.PlayerInfo;
-import net.tylermurphy.hideAndSeek.game.Board;
-import net.tylermurphy.hideAndSeek.game.util.WinType;
+import dev.tylerm.khs.Main;
+import dev.tylerm.khs.database.util.PlayerInfo;
+import dev.tylerm.khs.game.Board;
+import dev.tylerm.khs.game.util.WinType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/database/InventoryTable.java b/src/main/java/dev/tylerm/khs/database/InventoryTable.java
index b023801..3fc62fb 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/database/InventoryTable.java
+++ b/src/main/java/dev/tylerm/khs/database/InventoryTable.java
@@ -1,6 +1,6 @@
-package net.tylermurphy.hideAndSeek.database;
+package dev.tylerm.khs.database;
 
-import net.tylermurphy.hideAndSeek.Main;
+import dev.tylerm.khs.Main;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.util.io.BukkitObjectInputStream;
 import org.bukkit.util.io.BukkitObjectOutputStream;
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/database/LegacyTable.java b/src/main/java/dev/tylerm/khs/database/LegacyTable.java
index e134c22..7bf079c 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/database/LegacyTable.java
+++ b/src/main/java/dev/tylerm/khs/database/LegacyTable.java
@@ -17,9 +17,9 @@
  *
  */
 
-package net.tylermurphy.hideAndSeek.database;
+package dev.tylerm.khs.database;
 
-import net.tylermurphy.hideAndSeek.database.util.LegacyPlayerInfo;
+import dev.tylerm.khs.database.util.LegacyPlayerInfo;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/database/NameDataTable.java b/src/main/java/dev/tylerm/khs/database/NameDataTable.java
index 4cc77fc..1ce7143 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/database/NameDataTable.java
+++ b/src/main/java/dev/tylerm/khs/database/NameDataTable.java
@@ -17,9 +17,9 @@
  *
  */
 
-package net.tylermurphy.hideAndSeek.database;
+package dev.tylerm.khs.database;
 
-import net.tylermurphy.hideAndSeek.Main;
+import dev.tylerm.khs.Main;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/database/connections/DatabaseConnection.java b/src/main/java/dev/tylerm/khs/database/connections/DatabaseConnection.java
index 466bda5..7dd8c01 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/database/connections/DatabaseConnection.java
+++ b/src/main/java/dev/tylerm/khs/database/connections/DatabaseConnection.java
@@ -17,7 +17,7 @@
  *
  */
 
-package net.tylermurphy.hideAndSeek.database.connections;
+package dev.tylerm.khs.database.connections;
 
 import java.sql.Connection;
 import java.sql.SQLException;
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/database/connections/MySQLConnection.java b/src/main/java/dev/tylerm/khs/database/connections/MySQLConnection.java
index 20e7c8e..0f7ce30 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/database/connections/MySQLConnection.java
+++ b/src/main/java/dev/tylerm/khs/database/connections/MySQLConnection.java
@@ -17,17 +17,16 @@
  *
  */
 
-package net.tylermurphy.hideAndSeek.database.connections;
+package dev.tylerm.khs.database.connections;
 
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
-import net.tylermurphy.hideAndSeek.Main;
+import dev.tylerm.khs.Main;
+import dev.tylerm.khs.configuration.Config;
 
 import java.sql.Connection;
 import java.sql.SQLException;
 
-import static net.tylermurphy.hideAndSeek.configuration.Config.*;
-
 public class MySQLConnection implements DatabaseConnection {
 
     private final HikariDataSource ds;
@@ -36,20 +35,20 @@ public class MySQLConnection implements DatabaseConnection {
 
         HikariConfig config = new HikariConfig();
 
-        Main.getInstance().getLogger().info("Database host: " + databaseHost);
-        Main.getInstance().getLogger().info("Database port: " + databasePort);
-        Main.getInstance().getLogger().info("Database user: " + databaseUser);
+        Main.getInstance().getLogger().info("Database host: " + Config.databaseHost);
+        Main.getInstance().getLogger().info("Database port: " + Config.databasePort);
+        Main.getInstance().getLogger().info("Database user: " + Config.databaseUser);
         Main.getInstance().getLogger().info("Database pass: xxxxxxxxxxx");
-        Main.getInstance().getLogger().info("Database name: " + databaseName);
+        Main.getInstance().getLogger().info("Database name: " + Config.databaseName);
 
 
         config.setDriverClassName(org.mariadb.jdbc.Driver.class.getName());
-        config.setJdbcUrl("jdbc:mariadb://"+databaseHost+":"+databasePort+"/"+databaseName.trim());
+        config.setJdbcUrl("jdbc:mariadb://"+ Config.databaseHost+":"+ Config.databasePort+"/"+ Config.databaseName.trim());
         config.addDataSourceProperty("cachePrepStmts", "true");
         config.addDataSourceProperty("prepStmtCacheSize", "250");
         config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048");
-        config.addDataSourceProperty("user", databaseUser);
-        config.addDataSourceProperty("password",databasePass);
+        config.addDataSourceProperty("user", Config.databaseUser);
+        config.addDataSourceProperty("password", Config.databasePass);
         config.addDataSourceProperty("autoCommit", "true");
         config.setAutoCommit(true);
         config.setMaximumPoolSize(20);
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/database/connections/SQLiteConnection.java b/src/main/java/dev/tylerm/khs/database/connections/SQLiteConnection.java
index bbf330b..70a31fd 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/database/connections/SQLiteConnection.java
+++ b/src/main/java/dev/tylerm/khs/database/connections/SQLiteConnection.java
@@ -17,9 +17,9 @@
  *
  */
 
-package net.tylermurphy.hideAndSeek.database.connections;
+package dev.tylerm.khs.database.connections;
 
-import net.tylermurphy.hideAndSeek.Main;
+import dev.tylerm.khs.Main;
 import org.sqlite.SQLiteConfig;
 
 import java.io.File;
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/database/util/LegacyPlayerInfo.java b/src/main/java/dev/tylerm/khs/database/util/LegacyPlayerInfo.java
index 067ab0b..bbf6e55 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/database/util/LegacyPlayerInfo.java
+++ b/src/main/java/dev/tylerm/khs/database/util/LegacyPlayerInfo.java
@@ -17,7 +17,7 @@
  *
  */
 
-package net.tylermurphy.hideAndSeek.database.util;
+package dev.tylerm.khs.database.util;
 
 public class LegacyPlayerInfo {
 
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/database/util/PlayerInfo.java b/src/main/java/dev/tylerm/khs/database/util/PlayerInfo.java
index 96fe9d8..555a954 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/database/util/PlayerInfo.java
+++ b/src/main/java/dev/tylerm/khs/database/util/PlayerInfo.java
@@ -17,7 +17,7 @@
  *
  */
 
-package net.tylermurphy.hideAndSeek.database.util;
+package dev.tylerm.khs.database.util;
 
 import java.util.UUID;