temp commit

Author: sysnote8main

build.gradle.kts

@@ -29,7 +29,7 @@ dependencies {
 
     // database
     implementation(libs.hikaricp)
-    implementation(libs.mysqlConnectorJ)
+    implementation(libs.mariaDBConnectorJ)
     implementation(libs.bundles.jdbi)
     implementation(libs.bundles.flyway)
 
@@ -57,8 +57,8 @@ tasks {
     processResources {
         val props =
             mapOf(
-                "version" to version,
-                "name" to name,
+                "version" to project.version,
+                "name" to project.name,
                 "description" to plDescription,
                 "websiteUrl" to plWebsiteUrl,
             )
@@ -70,12 +70,14 @@ tasks {
     }
 
     shadowJar {
-        enableAutoRelocation = true
-        relocationPrefix = "net.azisaba.kdstatusreloaded.libs"
+//        enableAutoRelocation = true
+//        relocationPrefix = "net.azisaba.kdstatusreloaded.libs"
+        mergeServiceFiles()
     }
 
     runServer {
         minecraftVersion("1.16.5")
+        ignoreUnsupportedJvm()
     }
 
     compileJava {

gradle/libs.versions.toml

@@ -6,10 +6,10 @@ runPaper = "3.0.0"
 # library
 spigotApi = "1.16.5-R0.1-SNAPSHOT"
 configLib = "4.6.1"
-mysqlConnectorJ = "9.4.0"
+mariaDBConnectorJ = "3.5.5"
 hikaricp = "7.0.2"
 jdbi = "3.49.5"
-flyway = "9.13.0"
+flyway = "11.12.0"
 jspecify = "1.0.0"
 junit = "5.13.4"
 
@@ -25,7 +25,7 @@ spigotApi = { module = "org.spigotmc:spigot-api", version.ref = "spigotApi" }
 configLib = { module = "de.exlll:configlib-yaml", version.ref = "configLib" }
 
 # database
-mysqlConnectorJ = { module = "com.mysql:mysql-connector-j", version.ref = "mysqlConnectorJ" }
+mariaDBConnectorJ = { module = "org.mariadb.jdbc:mariadb-java-client", version.ref = "mariaDBConnectorJ"}
 hikaricp = { module = "com.zaxxer:HikariCP", version.ref = "hikaricp" }
 jdbiCore = { module = "org.jdbi:jdbi3-core", version.ref = "jdbi" }
 jdbiSqlobject = { module = "org.jdbi:jdbi3-sqlobject", version.ref = "jdbi" }

src/main/java/net/azisaba/kdstatusreloaded/KDStatusReloaded.java

@@ -4,7 +4,6 @@
 import net.azisaba.kdstatusreloaded.commands.KDSCommands;
 import net.azisaba.kdstatusreloaded.config.KDConfig;
 import net.azisaba.kdstatusreloaded.playerkd.PlayerKD;
-import net.azisaba.kdstatusreloaded.playerkd.db.KDDatabase;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Entity;
 import org.bukkit.event.Listener;
@@ -19,7 +18,6 @@ public class KDStatusReloaded extends JavaPlugin {
     private static final Logger logger = LoggerFactory.getLogger(KDStatusReloaded.class);
     private static KDStatusReloaded plugin;
     protected File configFile;
-    protected KDDatabase kdDatabase;
     protected KDConfig kdConfig;
     protected PlayerKD playerKd;
 
@@ -41,7 +39,6 @@ public void onEnable() {
         }
 
         kdConfig = YamlConfigurations.load(configFile.toPath(), KDConfig.class);
-        kdDatabase = new KDDatabase(kdConfig.database);
 
         playerKd = new PlayerKD(this);
 

src/main/java/net/azisaba/kdstatusreloaded/playerkd/PlayerKD.java

@@ -17,7 +17,7 @@ public class PlayerKD {
     private final KDCache kdCache;
 
     public PlayerKD(KDStatusReloaded plugin) {
-        kdDatabase = new KDDatabase(plugin.getPluginConfig().database);
+        kdDatabase = new KDDatabase(plugin.getPluginConfig().database, plugin.getDataFolder());
         kdCache = new KDCache(kdDatabase.kdUserDataRepository());
         plugin.register(new PlayerEventListener(kdCache, plugin.getPluginConfig().world));
     }

src/main/java/net/azisaba/kdstatusreloaded/playerkd/db/KDDatabase.java

@@ -3,21 +3,41 @@
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
 import net.azisaba.kdstatusreloaded.config.KDConfig;
+import org.bukkit.Bukkit;
 import org.flywaydb.core.Flyway;
 import org.jdbi.v3.core.Jdbi;
 import org.jdbi.v3.sqlobject.SqlObjectPlugin;
 import org.jspecify.annotations.NullMarked;
 
+import java.io.File;
+import java.io.InputStream;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.util.Enumeration;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+
 @NullMarked
 public class KDDatabase {
     private final HikariDataSource hikariDataSource;
     private Jdbi jdbi;
     private KDUserDataRepository kdUserDataRepository;
+    private final File tmpFolder;
+
+    public KDDatabase(KDConfig.DatabaseConfig dbConfig, File pluginFolder) {
+        try {
+            Class.forName("org.mariadb.jdbc.Driver");
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+        tmpFolder = new File(pluginFolder, "migration_tmp");
+        if(!tmpFolder.exists()) tmpFolder.mkdirs();
 
-    public KDDatabase(KDConfig.DatabaseConfig dbConfig) {
         // create HikariCP datasource
         HikariConfig config = new HikariConfig();
-        config.setJdbcUrl(String.format("jdbc:mysql://%s:%d/%s", dbConfig.host, dbConfig.port, dbConfig.dbName));
+        config.setJdbcUrl(String.format("jdbc:mariadb://%s:%d/%s", dbConfig.host, dbConfig.port, dbConfig.dbName));
         config.setUsername(dbConfig.username);
         config.setPassword(dbConfig.password);
         hikariDataSource = new HikariDataSource(config);