diff --git a/.gitignore b/.gitignore index 3633f4a..8723c36 100755 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,6 @@ .idea testserver run -galaxy notes # Compiled class file diff --git a/api/src/main/java/com/alttd/chat/ChatImplementation.java b/api/src/main/java/com/alttd/chat/ChatImplementation.java index 12d140e..28a4c49 100755 --- a/api/src/main/java/com/alttd/chat/ChatImplementation.java +++ b/api/src/main/java/com/alttd/chat/ChatImplementation.java @@ -20,8 +20,8 @@ public class ChatImplementation implements ChatAPI{ Config.init(); luckPerms = getLuckPerms(); - //databaseConnection = getDataBase(); // todo fix sql - //Queries.createTables(); // todo fix sql + databaseConnection = getDataBase(); // todo fix sql + Queries.createTables(); // todo fix sql ChatUserManager.initialize(); // loads all the users from the db and adds them. RegexManager.initialize(); // load the filters and regexes from config diff --git a/api/src/main/java/com/alttd/chat/config/Config.java b/api/src/main/java/com/alttd/chat/config/Config.java index 2f7f78d..2602258 100755 --- a/api/src/main/java/com/alttd/chat/config/Config.java +++ b/api/src/main/java/com/alttd/chat/config/Config.java @@ -236,14 +236,12 @@ public final class Config { } - public static String DRIVER = "mysql"; public static String IP = "0.0.0.0"; public static String PORT = "3306"; public static String DATABASE = "database"; public static String USERNAME = "root"; public static String PASSWORD = "root"; private static void database() { - DRIVER = getString("database.driver" , DRIVER); IP = getString("database.ip", IP); PORT = getString("database.port", PORT); DATABASE = getString("database.name", DATABASE); diff --git a/api/src/main/java/com/alttd/chat/database/DatabaseConnection.java b/api/src/main/java/com/alttd/chat/database/DatabaseConnection.java index 6c633db..7a4afcd 100755 --- a/api/src/main/java/com/alttd/chat/database/DatabaseConnection.java +++ b/api/src/main/java/com/alttd/chat/database/DatabaseConnection.java @@ -2,6 +2,7 @@ package com.alttd.chat.database; import com.alttd.chat.config.Config; +import com.alttd.chat.util.ALogger; import java.sql.Connection; import java.sql.DriverManager; @@ -44,8 +45,11 @@ public class DatabaseConnection { e.printStackTrace(); } + ALogger.info("jdbc:mysql://" + Config.IP + ":" + Config.PORT + "/" + Config.DATABASE + "?autoReconnect=true"+ + "&useSSL=false"); connection = DriverManager.getConnection( - "jdbc:" + Config.DRIVER + "://" + Config.IP + ":" + Config.PORT + "/" + Config.DATABASE + "?autoReconnect=true&enabledTLSProtocols=TLSv1.1", + "jdbc:mysql://" + Config.IP + ":" + Config.PORT + "/" + Config.DATABASE + "?autoReconnect=true"+ + "&useSSL=false", Config.USERNAME, Config.PASSWORD); } } diff --git a/api/src/main/java/com/alttd/chat/managers/RegexManager.java b/api/src/main/java/com/alttd/chat/managers/RegexManager.java index 8201833..07fc270 100755 --- a/api/src/main/java/com/alttd/chat/managers/RegexManager.java +++ b/api/src/main/java/com/alttd/chat/managers/RegexManager.java @@ -18,7 +18,6 @@ public class RegexManager { } public static void addFilter(ChatFilter filter) { - ALogger.info("Adding " + filter.getName()); chatFilters.add(filter); } diff --git a/galaxy/dependency-reduced-pom.xml b/galaxy/dependency-reduced-pom.xml index 9f0798d..53935c4 100644 --- a/galaxy/dependency-reduced-pom.xml +++ b/galaxy/dependency-reduced-pom.xml @@ -39,7 +39,6 @@ - net.kyori:adventure-text-minimessage com.alttd.chat:chat-api org.spongepowered:configurate-yaml org.spongepowered:configurate-core diff --git a/galaxy/pom.xml b/galaxy/pom.xml index a88ad85..f2974f3 100755 --- a/galaxy/pom.xml +++ b/galaxy/pom.xml @@ -39,7 +39,6 @@ - net.kyori:adventure-text-minimessage com.alttd.chat:chat-api org.spongepowered:configurate-yaml org.spongepowered:configurate-core @@ -83,11 +82,6 @@ configurate-yaml 3.7.1 - - net.kyori - adventure-text-minimessage - 4.1.0-SNAPSHOT - com.alttd galaxy-api diff --git a/velocity/dependency-reduced-pom.xml b/velocity/dependency-reduced-pom.xml index 6dc9f84..24af4f1 100644 --- a/velocity/dependency-reduced-pom.xml +++ b/velocity/dependency-reduced-pom.xml @@ -74,7 +74,7 @@ mysql mysql-connector-java - 8.0.24 + 8.0.23 provided diff --git a/velocity/pom.xml b/velocity/pom.xml index a12c6ef..bd49074 100755 --- a/velocity/pom.xml +++ b/velocity/pom.xml @@ -95,7 +95,7 @@ mysql mysql-connector-java - 8.0.24 + 8.0.23 provided