summaryrefslogtreewikicommitdiff
path: root/src/main/java/net/tylermurphy/hideAndSeek/database
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/net/tylermurphy/hideAndSeek/database')
-rw-r--r--src/main/java/net/tylermurphy/hideAndSeek/database/Database.java21
-rw-r--r--src/main/java/net/tylermurphy/hideAndSeek/database/GameDataTable.java16
-rw-r--r--src/main/java/net/tylermurphy/hideAndSeek/database/connections/MySQLConnection.java8
3 files changed, 18 insertions, 27 deletions
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/database/Database.java b/src/main/java/net/tylermurphy/hideAndSeek/database/Database.java
index e7bfb26..dca2de0 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/database/Database.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/database/Database.java
@@ -1,22 +1,3 @@
-/*
- * This file is part of Kenshins Hide and Seek
- *
- * Copyright (c) 2021 Tyler Murphy.
- *
- * Kenshins Hide and Seek free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * he Free Software Foundation version 3.
- *
- * Kenshins Hide and Seek is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
package net.tylermurphy.hideAndSeek.database;
import com.google.common.io.ByteStreams;
@@ -45,8 +26,10 @@ public class Database {
public Database(){
if(databaseType.equals("SQLITE")) {
+ Main.getInstance().getLogger().info("SQLITE database chosen");
connection = new SQLiteConnection();
} else {
+ Main.getInstance().getLogger().info("MYSQL database chosen");
connection = new MySQLConnection();
}
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/database/GameDataTable.java b/src/main/java/net/tylermurphy/hideAndSeek/database/GameDataTable.java
index 8f0ddde..c01f615 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/database/GameDataTable.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/database/GameDataTable.java
@@ -175,10 +175,10 @@ public class GameDataTable {
@NotNull Board board,
@NotNull List<UUID> uuids,
@NotNull List<UUID> winners,
- @NotNull Map<String,Integer> hider_kills,
- @NotNull Map<String,Integer> hider_deaths,
- @NotNull Map<String,Integer> seeker_kills,
- @NotNull Map<String,Integer> seeker_deaths,
+ @NotNull Map<UUID,Integer> hider_kills,
+ @NotNull Map<UUID,Integer> hider_deaths,
+ @NotNull Map<UUID,Integer> seeker_kills,
+ @NotNull Map<UUID,Integer> seeker_deaths,
@NotNull WinType type
) {
for(UUID uuid : uuids) {
@@ -192,10 +192,10 @@ public class GameDataTable {
info.getSeekerWins() + (winners.contains(uuid) && type == WinType.SEEKER_WIN ? 1 : 0),
info.getHiderGames() + (board.isHider(uuid) || (board.isSeeker(uuid) && !board.getFirstSeeker().getUniqueId().equals(uuid)) ? 1 : 0),
info.getSeekerGames() + (board.getFirstSeeker().getUniqueId().equals(uuid) ? 1 : 0),
- info.getHiderKills() + hider_kills.getOrDefault(uuid.toString(), 0),
- info.getSeekerKills() + seeker_kills.getOrDefault(uuid.toString(), 0),
- info.getHiderDeaths() + hider_deaths.getOrDefault(uuid.toString(), 0),
- info.getSeekerDeaths() + seeker_deaths.getOrDefault(uuid.toString(), 0)
+ info.getHiderKills() + hider_kills.getOrDefault(uuid, 0),
+ info.getSeekerKills() + seeker_kills.getOrDefault(uuid, 0),
+ info.getHiderDeaths() + hider_deaths.getOrDefault(uuid, 0),
+ info.getSeekerDeaths() + seeker_deaths.getOrDefault(uuid, 0)
);
}
}
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/database/connections/MySQLConnection.java b/src/main/java/net/tylermurphy/hideAndSeek/database/connections/MySQLConnection.java
index b7c1b1d..56f53f6 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/database/connections/MySQLConnection.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/database/connections/MySQLConnection.java
@@ -21,6 +21,7 @@ package net.tylermurphy.hideAndSeek.database.connections;
import com.zaxxer.hikari.HikariConfig;
import com.zaxxer.hikari.HikariDataSource;
+import net.tylermurphy.hideAndSeek.Main;
import java.sql.Connection;
import java.sql.SQLException;
@@ -35,6 +36,13 @@ 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 pass: xxxxxxxxxxx");
+ Main.getInstance().getLogger().info("Database name: " + databaseName);
+
+
config.setJdbcUrl("jdbc:mariadb://"+databaseHost+":"+databasePort+"/"+databaseName);
config.addDataSourceProperty("cachePrepStmts", "true");
config.addDataSourceProperty("prepStmtCacheSize", "250");