diff --git a/.idea/libraries/mysql_5_1_36.xml b/.idea/libraries/mysql_5_1_36.xml deleted file mode 100644 index f6bb03a..0000000 --- a/.idea/libraries/mysql_5_1_36.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/LaunchServer/LaunchServer.iml b/LaunchServer/LaunchServer.iml index ea3e4b4..8789ef2 100644 --- a/LaunchServer/LaunchServer.iml +++ b/LaunchServer/LaunchServer.iml @@ -18,8 +18,16 @@ + + + + + + + + + - diff --git a/LaunchServer/resources/launchserver/defaults/profile1.12.2.cfg b/LaunchServer/resources/launchserver/defaults/profile1.12.2.cfg index af7aa50..c95f571 100644 --- a/LaunchServer/resources/launchserver/defaults/profile1.12.2.cfg +++ b/LaunchServer/resources/launchserver/defaults/profile1.12.2.cfg @@ -1,4 +1,4 @@ -version: "1.12"; +version: "1.12.2"; assetIndex: "1.12"; # 1.7.10+ only # Runtime-dependent params diff --git a/LaunchServer/source/auth/MySQLSourceConfig.java b/LaunchServer/source/auth/MySQLSourceConfig.java index 9de27da..fb220e3 100644 --- a/LaunchServer/source/auth/MySQLSourceConfig.java +++ b/LaunchServer/source/auth/MySQLSourceConfig.java @@ -4,7 +4,7 @@ import java.sql.SQLException; import javax.sql.DataSource; -import com.mysql.jdbc.jdbc2.optional.MysqlDataSource; +import com.mysql.cj.jdbc.MysqlDataSource; import com.zaxxer.hikari.HikariDataSource; import launcher.LauncherAPI; import launcher.helper.LogHelper; @@ -64,7 +64,7 @@ public synchronized Connection getConnection() throws SQLException { if (source == null) { // New data source MysqlDataSource mysqlSource = new MysqlDataSource(); - mysqlSource.setUseUnicode(true); + mysqlSource.setCharacterEncoding("UTF-8"); // Prep statements cache mysqlSource.setPrepStmtCacheSize(250);