fix: luckperms cannot load normally

Author: alazeprt

common/src/main/kotlin/top/alazeprt/aqqbot/AQQBot.kt

@@ -177,6 +177,10 @@ interface AQQBot: ConfigProvider, CommandProvider, DataProvider, HookProvider, T
         }
     }
 
+    override fun loadDataDependencies() {
+        dataProvider.loadDataDependencies()
+    }
+
     fun loadCommonDependencies() {
         libraryManager.addRepository("https://maven.aliyun.com/repository/public")
         libraryManager.addMavenCentral()
@@ -190,50 +194,19 @@ interface AQQBot: ConfigProvider, CommandProvider, DataProvider, HookProvider, T
                 .build()
             libraryManager.loadLibrary(nashornLib)
         }
-        val databaseLib = Library.builder()
-            .groupId("com{}github{}alazeprt")
-            .artifactId("taboolib-database")
-            .version("1.0.4")
-            .relocate("com{}google{}common", "top{}alazeprt{}aqqbot{}lib{}com{}google{}common")
-            .build()
-        val hikaricpLib = Library.builder()
-            .groupId("com{}zaxxer")
-            .artifactId("HikariCP")
-            .version("4.0.3")
-            .resolveTransitiveDependencies(true)
-            .build()
-        val guavaLib = Library.builder()
-            .groupId("com{}google{}guava")
-            .artifactId("guava")
-            .version("21.0")
-            .relocate("com{}google{}common", "top{}alazeprt{}aqqbot{}lib{}com{}google{}common")
-            .resolveTransitiveDependencies(true)
-            .build()
-        val sqliteLib = Library.builder()
-            .groupId("org{}xerial")
-            .artifactId("sqlite-jdbc")
-            .version("3.49.0.0")
-            .resolveTransitiveDependencies(true)
-            .build()
         val aconfigurationLib = Library.builder()
             .groupId("com{}github{}alazeprt")
             .artifactId("AConfiguration")
             .version("1.2")
             .build()
-        val mysqlLib = Library.builder()
-            .groupId("com{}mysql")
-            .artifactId("mysql-connector-j")
-            .version("8.3.0")
-            .resolveTransitiveDependencies(true)
-            .build()
         val aonebotLib = Library.builder()
             .groupId("com{}github{}alazeprt")
             .artifactId("AOneBot")
             .version("1.0.18-beta")
             .relocate("com{}google{}code{}gson", "top{}alazeprt{}aonebot{}lib{}com{}google")
             .resolveTransitiveDependencies(true)
             .build()
-        libraryManager.loadLibraries(databaseLib, hikaricpLib, guavaLib, sqliteLib, aconfigurationLib, mysqlLib, aonebotLib)
+        libraryManager.loadLibraries(aconfigurationLib, aonebotLib)
     }
 
     fun loadDependencies()

common/src/main/kotlin/top/alazeprt/aqqbot/data/DataProvider.kt

@@ -5,6 +5,8 @@ import top.alazeprt.aqqbot.profile.AOfflinePlayer
 interface DataProvider {
     fun loadData(type: DataStorageType)
 
+    fun loadDataDependencies()
+
     fun getStorageType(): DataStorageType
 
     fun saveData(type: DataStorageType)

common/src/main/kotlin/top/alazeprt/aqqbot/data/FileDataProvider.kt

@@ -13,6 +13,8 @@ class FileDataProvider(val plugin: AQQBot) : DataProvider {
     private lateinit var dataConfig: FileConfiguration
     val dataMap: MutableMap<String, MutableList<String>> = ConcurrentHashMap()
 
+    override fun loadDataDependencies() {}
+
     override fun loadData(type: DataStorageType) {
         dataConfig = YamlConfiguration.loadConfiguration(file)
         dataConfig.getKeys(false).forEach {

common/src/main/kotlin/top/alazeprt/aqqbot/data/MySQLProvider.kt

@@ -1,5 +1,6 @@
 package top.alazeprt.aqqbot.data
 
+import com.alessiodp.libby.Library
 import me.regadpole.config.DatabaseSource
 import taboolib.module.database.*
 import top.alazeprt.aconfiguration.file.YamlConfiguration
@@ -12,6 +13,35 @@ class MySQLProvider(plugin: AQQBot) : DatabaseDataProvider(plugin) {
     override lateinit var table: Table<*, *>
     override lateinit var dataSource: DataSource
 
+    override fun loadDataDependencies() {
+        val databaseLib = Library.builder()
+            .groupId("com{}github{}alazeprt")
+            .artifactId("taboolib-database")
+            .version("1.0.4")
+            .relocate("com{}google{}common", "top{}alazeprt{}aqqbot{}lib{}com{}google{}common")
+            .build()
+        val hikaricpLib = Library.builder()
+            .groupId("com{}zaxxer")
+            .artifactId("HikariCP")
+            .version("4.0.3")
+            .resolveTransitiveDependencies(true)
+            .build()
+        val guavaLib = Library.builder()
+            .groupId("com{}google{}guava")
+            .artifactId("guava")
+            .version("21.0")
+            .relocate("com{}google{}common", "top{}alazeprt{}aqqbot{}lib{}com{}google{}common")
+            .resolveTransitiveDependencies(true)
+            .build()
+        val mysqlLib = Library.builder()
+            .groupId("com{}mysql")
+            .artifactId("mysql-connector-j")
+            .version("8.3.0")
+            .resolveTransitiveDependencies(true)
+            .build()
+        plugin.libraryManager.loadLibraries(hikaricpLib, guavaLib, mysqlLib, databaseLib)
+    }
+
     override fun loadData(type: DataStorageType) {
         val config = plugin.generalConfig
         val host = HostSQL(config.getString("storage.mysql.host", null),

common/src/main/kotlin/top/alazeprt/aqqbot/data/SQLiteProvider.kt

@@ -1,5 +1,6 @@
 package top.alazeprt.aqqbot.data
 
+import com.alessiodp.libby.Library
 import me.regadpole.config.DatabaseSource
 import taboolib.module.database.*
 import top.alazeprt.aconfiguration.file.YamlConfiguration
@@ -12,6 +13,35 @@ class SQLiteProvider(plugin: AQQBot) : DatabaseDataProvider(plugin) {
     override lateinit var table: Table<*, *>
     override lateinit var dataSource: DataSource
 
+    override fun loadDataDependencies() {
+        val databaseLib = Library.builder()
+            .groupId("com{}github{}alazeprt")
+            .artifactId("taboolib-database")
+            .version("1.0.4")
+            .relocate("com{}google{}common", "top{}alazeprt{}aqqbot{}lib{}com{}google{}common")
+            .build()
+        val hikaricpLib = Library.builder()
+            .groupId("com{}zaxxer")
+            .artifactId("HikariCP")
+            .version("4.0.3")
+            .resolveTransitiveDependencies(true)
+            .build()
+        val guavaLib = Library.builder()
+            .groupId("com{}google{}guava")
+            .artifactId("guava")
+            .version("21.0")
+            .relocate("com{}google{}common", "top{}alazeprt{}aqqbot{}lib{}com{}google{}common")
+            .resolveTransitiveDependencies(true)
+            .build()
+        val sqliteLib = Library.builder()
+            .groupId("org{}xerial")
+            .artifactId("sqlite-jdbc")
+            .version("3.49.0.0")
+            .resolveTransitiveDependencies(true)
+            .build()
+        plugin.libraryManager.loadLibraries(hikaricpLib, guavaLib, sqliteLib, databaseLib)
+    }
+
     override fun loadData(type: DataStorageType) {
         val host = HostSQLite(File(plugin.getDataFolder(), plugin.generalConfig.getString("storage.sqlite.file", null)))
         val dataSourceFile = File(plugin.getDataFolder(), "datasource.yml")

common/src/main/kotlin/top/alazeprt/aqqbot/hook/HookProvider.kt

@@ -1,6 +1,5 @@
 package top.alazeprt.aqqbot.hook
 
-import net.luckperms.api.LuckPermsProvider
 import top.alazeprt.aqqbot.AQQBot
 import top.alazeprt.aqqbot.profile.APlayer
 import top.alazeprt.aqqbot.util.LogLevel
@@ -41,6 +40,7 @@ interface HookProvider {
     fun loadFakeplayer(plugin: AQQBot) {
         try {
             Class.forName("io.github.hello09x.fakeplayer.core.Main")
+            fakePlayer = true
         } catch (ignored: ClassNotFoundException) {
             return
         }
@@ -49,7 +49,8 @@ interface HookProvider {
 
     fun loadLuckPerms(plugin: AQQBot) {
         try {
-            LuckPermsProvider.get()
+            Class.forName("net.luckperms.api.LuckPermsProvider")
+            luckperms = true
         } catch (ignored: ClassNotFoundException) {
             return
         }