From 989fea42540e04b6543c88e726af2c417d099404 Mon Sep 17 00:00:00 2001 From: Xiao-MoMi <70987828+Xiao-MoMi@users.noreply.github.com> Date: Wed, 3 May 2023 00:59:31 +0800 Subject: [PATCH] 1.3.0.13.2 --- build.gradle | 2 +- .../momirealms/customfishing/CustomFishing.java | 1 + .../customfishing/data/storage/SqlConnection.java | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a615151c..4c82a809 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { } group = 'net.momirealms' -version = '1.3.0.13.1' +version = '1.3.0.13.2' repositories { mavenCentral() diff --git a/src/main/java/net/momirealms/customfishing/CustomFishing.java b/src/main/java/net/momirealms/customfishing/CustomFishing.java index 651988ba..947faf1d 100644 --- a/src/main/java/net/momirealms/customfishing/CustomFishing.java +++ b/src/main/java/net/momirealms/customfishing/CustomFishing.java @@ -130,6 +130,7 @@ public final class CustomFishing extends JavaPlugin { LibraryLoader.load("com.zaxxer","HikariCP","5.0.1", libRepo); LibraryLoader.load("net.objecthunter","exp4j","0.4.8", libRepo); LibraryLoader.load("org.mariadb.jdbc","mariadb-java-client","3.1.4", libRepo); + LibraryLoader.load("mysql","mysql-connector-java","8.0.30", libRepo); } private void registerQuests() { diff --git a/src/main/java/net/momirealms/customfishing/data/storage/SqlConnection.java b/src/main/java/net/momirealms/customfishing/data/storage/SqlConnection.java index bd853d19..3c930849 100644 --- a/src/main/java/net/momirealms/customfishing/data/storage/SqlConnection.java +++ b/src/main/java/net/momirealms/customfishing/data/storage/SqlConnection.java @@ -50,8 +50,23 @@ public class SqlConnection { HikariConfig hikariConfig = new HikariConfig(); String sql = "mysql"; if (storageMode.equalsIgnoreCase("MariaDB")) { + try { + Class.forName("org.mariadb.jdbc.Driver"); + } catch (ClassNotFoundException e1) { + AdventureUtils.consoleMessage("[CustomFishing] No sql driver is found."); + } hikariConfig.setDriverClassName("org.mariadb.jdbc.Driver"); sql = "mariadb"; + } else { + try { + Class.forName("com.mysql.jdbc.Driver"); + } catch (ClassNotFoundException e1) { + try { + Class.forName("com.mysql.cj.jdbc.Driver"); + } catch (ClassNotFoundException e2) { + AdventureUtils.consoleMessage("[CustomFishing] No sql driver is found."); + } + } } tablePrefix = config.getString(storageMode + ".table-prefix"); hikariConfig.setPoolName("[CustomFishing]");