Merge pull request #161 from YsGqHY/stable/v3

feat(plugin): 添加 Tooltip Style 和 ItemModel 功能

Author: YsGqHY

build.gradle.kts

@@ -59,7 +59,7 @@ subprojects {
             )
         }
         version {
-            taboolib = "6.2.3-20d868d"
+            taboolib = "6.2.3-d89e06f"
             coroutines = null
         }
     }

common/src/main/kotlin/trplugins/menu/util/conf/Property.kt

@@ -228,6 +228,16 @@ enum class Property(val default: String, val regex: Regex) {
      */
     ICON_DISPLAY_NBT("nbt", "nbts?"),
 
+    /**
+     * 菜单图标 - Tooltip Style
+     */
+    ICON_DISPLAY_TOOLTIP("tooltip", "tooltip(_style)?"),
+
+    /**
+     * 菜单图标 - ItemModel
+     */
+    ICON_DISPLAY_ITEM_MODEL("model", "(item)?_?model"),
+
     /**
      * 菜单图标 - 子图标
      */

gradle.properties

@@ -1,2 +1,2 @@
 group=me.arasple.mc.trmenu
-version=3.4.2
+version=3.4.3

plugin/build.gradle.kts

@@ -30,11 +30,13 @@ taboolib {
             name("Nexo").with("bukkit").optional(true)
             name("NBTAPI").with("bukkit").optional(true).loadafter(true)
             name("TrMenu-Graal").with("bukkit").optional(true)
+            name("AzureFlow").with("bukkit").optional(true)
+            name("CraftEngine").with("bukkit").optional(true)
         }
     }
     relocate("trplugins.menu", group.toString())
-    relocate("ink.ptms.um","${group}.um")
-    relocate("top.maplex.arim","${group}.arim")
+    relocate("ink.ptms.um", "${group}.um")
+    relocate("top.maplex.arim", "${group}.arim")
 }
 
 repositories {

plugin/src/main/kotlin/trplugins/menu/module/conf/MenuSerializer.kt

@@ -349,6 +349,12 @@ object MenuSerializer : ISerializer {
             } else {
                 ItemTag().also { Property.ICON_DISPLAY_NBT.ofMap(display).forEach { (key, value) -> it[key] = ItemTagData.toNBT(value) } }
             }
+            val tooltipStyle = if (inherit.contains(Property.ICON_DISPLAY_TOOLTIP)) {
+                def!!.display.meta.tooltip
+            } else Property.ICON_DISPLAY_TOOLTIP.ofString(display, "")
+            val itemModel = if (inherit.contains(Property.ICON_DISPLAY_ITEM_MODEL)) {
+                def!!.display.meta.itemModel
+            } else Property.ICON_DISPLAY_ITEM_MODEL.ofString(display, "")
 
             // only for the subIcon
             val priority = Property.PRIORITY.ofInt(it, order)
@@ -385,7 +391,7 @@ object MenuSerializer : ISerializer {
                 if (def != null && inherit.contains(Property.ICON_DISPLAY_LORE) && lore.isEmpty()) def.display.lore
                 else CycleList(lore.map { Lore(line(it)) }),
                 // 图标附加属性
-                Meta(amount, shiny, flags, nbt)
+                Meta(amount, shiny, flags, nbt, tooltipStyle, itemModel)
             )
 
             // i18n

plugin/src/main/kotlin/trplugins/menu/module/display/item/Item.kt

@@ -87,6 +87,8 @@ open class Item(
             }
             meta.flags(this)
             meta.shiny(session, this)
+            meta.tooltipStyle(session, this)
+            meta.itemModel(session, this)
 
             if (meta.hasAmount()) this.amount = meta.amount(session)
         }

plugin/src/main/kotlin/trplugins/menu/module/display/item/Meta.kt

@@ -1,5 +1,6 @@
 package trplugins.menu.module.display.item
 
+import org.bukkit.NamespacedKey
 import org.bukkit.inventory.ItemFlag
 import org.bukkit.inventory.ItemStack
 import org.bukkit.inventory.meta.ItemMeta
@@ -20,6 +21,8 @@ class Meta(
     val shiny: String,
     val flags: Array<ItemFlag>,
     val nbt: ItemTag?,
+    val tooltip: String?,
+    val itemModel: String?,
 ) {
 
     private val isAmountDynamic = amount.toIntOrNull() == null
@@ -60,4 +63,20 @@ class Meta(
         return amount.isNotEmpty() || amount.toIntOrNull() != null
     }
 
+    fun tooltipStyle(session: MenuSession, builder: ItemBuilder) {
+        if (tooltip.isNullOrEmpty()) {
+            return
+        }
+        val key = session.placeholderPlayer.evalScript(tooltip).asString().let { NamespacedKey.fromString(it) }
+        builder.tooltipStyle = key
+    }
+
+    fun itemModel(session: MenuSession, builder: ItemBuilder) {
+        if (itemModel.isNullOrEmpty()) {
+            return
+        }
+        val key = session.placeholderPlayer.evalScript(itemModel).asString().let { NamespacedKey.fromString(it) }
+        builder.itemModel = key
+    }
+
 }