Merge pull request #572 from YsGqHY/dev/6.2.3-dev

更新 ItemBuilder

Author: Bkm016

module/bukkit/bukkit-util/src/main/kotlin/taboolib/platform/util/ItemBuilder.kt

@@ -15,10 +15,8 @@ import org.bukkit.inventory.ItemStack
 import org.bukkit.inventory.meta.*
 import org.bukkit.potion.PotionData
 import org.bukkit.potion.PotionEffect
-import org.tabooproject.reflex.Reflex.Companion.getProperty
 import org.tabooproject.reflex.Reflex.Companion.invokeMethod
 import taboolib.common.util.random
-import taboolib.common5.cint
 import taboolib.library.xseries.XAttribute
 import taboolib.library.xseries.XMaterial
 import taboolib.module.chat.colored
@@ -155,6 +153,8 @@ open class ItemBuilder {
      */
     var itemModel: NamespacedKey? = null
 
+    var isHideTooltip: Boolean = false
+
     /**
      * 唯一化
      */
@@ -294,7 +294,7 @@ open class ItemBuilder {
         // CustomModelData
         runCatching {
             if (customModelData != -1) {
-                itemMeta.invokeMethod<Void>("setCustomModelData", customModelData)
+                itemMeta.setCustomModelData(customModelData)
             }
         }
         // Tooltip Style
@@ -305,6 +305,10 @@ open class ItemBuilder {
         runCatching {
             itemMeta.itemModel = itemModel
         }
+        // Hide Tooltip
+        runCatching {
+            itemMeta.isHideTooltip = isHideTooltip
+        }
         // 唯一化
         runCatching {
             if (unique) {
@@ -401,12 +405,7 @@ open class ItemBuilder {
         }
         // CustomModelData
         runCatching {
-            val modelData = itemMeta.getProperty<Any>("customModelData")
-            customModelData = if (modelData is Int) {
-                itemMeta.getProperty<Int>("customModelData") ?: -1
-            } else {
-                modelData?.getProperty<Any>("handle")?.getProperty<List<Float>>("floats")?.firstOrNull()?.cint ?: -1
-            }
+            customModelData = itemMeta.customModelData
         }
         // Tooltip Style
         runCatching {
@@ -416,6 +415,10 @@ open class ItemBuilder {
         runCatching {
             itemModel = itemMeta.itemModel
         }
+        // Hide Tooltip
+        runCatching {
+            isHideTooltip = itemMeta.isHideTooltip
+        }
     }
 }