Merge pull request #173 from YsGqHY/stable/v3

optimize & fix

Author: YsGqHY

api/receptacle/build.gradle.kts

@@ -1,4 +1,4 @@
-    repositories {
+repositories {
     maven("https://repo.aeoliancloud.com/repository/releases") { isAllowInsecureProtocol = true }
 }
 

api/receptacle/src/main/kotlin/trplugins/menu/api/receptacle/vanilla/window/NMSImpl.kt

@@ -166,7 +166,7 @@ class NMSImpl : NMS() {
                     sendPacket(
                         player,
                         ClientboundSetCursorItemPacket::class.java.unsafeInstance(),
-                        "contents" to toNMSCopy(ItemStack(Material.AIR))
+                        "contents" to toNMSCopy(null)
                     )
                 }
             }

gradle.properties

@@ -1,2 +1,2 @@
 group=me.arasple.mc.trmenu
-version=3.5.3
+version=3.5.4

plugin/src/main/kotlin/trplugins/menu/TrMenu.kt

@@ -3,11 +3,12 @@ package trplugins.menu
 import org.bukkit.Bukkit
 import taboolib.common.platform.Plugin
 import taboolib.common.platform.function.console
+import taboolib.common.platform.function.pluginVersion
 import taboolib.module.configuration.Config
 import taboolib.module.configuration.Configuration
 import taboolib.module.lang.Language
 import taboolib.module.lang.sendLang
-import taboolib.platform.BukkitPlugin
+import taboolib.platform.util.bukkitPlugin
 import trplugins.menu.api.action.ActionHandle
 import trplugins.menu.api.action.impl.send.Tell
 import trplugins.menu.api.receptacle.provider.PlatformProvider
@@ -17,6 +18,8 @@ import trplugins.menu.module.conf.prop.RunningPerformance
 import trplugins.menu.module.display.MenuSession
 import trplugins.menu.module.display.session
 import trplugins.menu.module.internal.data.Metadata
+import trplugins.menu.module.internal.database.GlobalDataDao
+import trplugins.menu.module.internal.database.MetaDataDao
 import trplugins.menu.module.internal.hook.HookPlugin
 import trplugins.menu.module.internal.inputer.Inputer.Companion.cancelWords
 import trplugins.menu.module.internal.listener.ListenerItemInteract.interactCooldown
@@ -35,7 +38,7 @@ object TrMenu : Plugin() {
     lateinit var SETTINGS: Configuration
         private set
 
-    val plugin by lazy { BukkitPlugin.getInstance() }
+    val plugin by lazy { bukkitPlugin }
 
     var performance = RunningPerformance.NORMAL
         private set
@@ -54,7 +57,9 @@ object TrMenu : Plugin() {
         onSettingsReload()
         Loader.loadMenus()
         Metadata.database
-        console().sendLang("Plugin-Enabled", plugin.description.version)
+        MetaDataDao.door
+        GlobalDataDao.door
+        console().sendLang("Plugin-Enabled", pluginVersion)
         console().sendLang("Plugin-Version")
         HookPlugin.printInfo()
     }

plugin/src/main/kotlin/trplugins/menu/module/internal/data/DataEntity.kt

@@ -11,5 +11,10 @@ data class DataEntity(
     @Length(-1)
     val data: String
 ) {
-    constructor(player: Player, key: String, data: String) : this(player.uniqueId, key, data)
+
+    companion object {
+        fun constructor(player: Player, key: String, data: String): DataEntity {
+            return DataEntity(player.uniqueId, key, data)
+        }
+    }
 }

plugin/src/main/kotlin/trplugins/menu/module/internal/data/Metadata.kt

@@ -80,7 +80,7 @@ object Metadata {
 
     fun saveData(player: Player, key: String) {
         submitAsync {
-            MetaDataDao.door.update(DataEntity(player, key, getData(player)[key]?.toString() ?: ""))
+            MetaDataDao.door.update(DataEntity.constructor(player, key, getData(player)[key]?.toString() ?: ""))
         }
     }
 
@@ -97,7 +97,7 @@ object Metadata {
             database.push(player)
         } else {
             dataMap.data.forEach { (key, value) ->
-                MetaDataDao.door.update(DataEntity(player, key, value?.toString() ?: ""))
+                MetaDataDao.door.update(DataEntity.constructor(player, key, value?.toString() ?: ""))
             }
         }
     }