feat(item): 添加物品附魔功能支持

YsGqHY · YsGqHY · commit 36e3d0576c92 · 2026-04-14T20:45:34.000+08:00
- 新增 DisplayEnchant 数据类处理附魔配置
- 实现附魔解析逻辑支持多种配置格式
- 添加动态附魔功能支持占位符变量
- 在 Item 类中集成附魔应用逻辑
- 更新 Meta 类添加附魔处理方法
- 修改 DialogNMSImpl 移除描述文本相关代码
- 更新版本号到 3.12.0
diff --git a/api/receptacle/src/main/kotlin/trplugins/menu/api/receptacle/dialog/DialogNMSImpl.kt b/api/receptacle/src/main/kotlin/trplugins/menu/api/receptacle/dialog/DialogNMSImpl.kt
@@ -213,27 +213,10 @@ class DialogNMSImpl : DialogNMS() {
 
     private fun buildItemBody(element: DialogElementPayload): Any {
         val item = toNmsItem(element.item ?: ItemStack(org.bukkit.Material.AIR))
-        val descriptionText = buildString {
-            element.item?.itemMeta?.displayName?.takeIf { it.isNotBlank() }?.also { append(it) }
-            val lore = element.item?.itemMeta?.lore.orEmpty()
-            if (lore.isNotEmpty()) {
-                if (isNotBlank()) append('\n')
-                append(lore.joinToString("\n"))
-            }
-        }.takeIf { it.isNotBlank() }
-        val description = descriptionText?.let {
-            Optional.of(
-                newInstance(
-                    PLAIN_MESSAGE_CLASS_NAME,
-                    component(it),
-                    element.width ?: DEFAULT_TEXT_WIDTH
-                )
-            )
-        } ?: Optional.empty<Any>()
         return newInstance(
             ITEM_BODY_CLASS_NAME,
             item,
-            description,
+            Optional.empty<Any>(),
             true,
             true,
             element.width ?: DEFAULT_ITEM_SIZE,
diff --git a/common/src/main/kotlin/trplugins/menu/util/conf/Property.kt b/common/src/main/kotlin/trplugins/menu/util/conf/Property.kt
@@ -358,6 +358,11 @@ enum class Property(val default: String, val regex: Regex) {
      */
     ICON_DISPLAY_AMOUNT("amount", "(amt|amount)s?"),
 
+    /**
+     * 菜单图标显示 - 附魔
+     */
+    ICON_DISPLAY_ENCHANT("enchant", "enchant(ment)?s?"),
+
     /**
      * 菜单图标显示 - 发光
      */
diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,2 @@
 group=me.arasple.mc.trmenu
-version=3.11.1
+version=3.12.0
diff --git a/plugin/src/main/kotlin/trplugins/menu/module/conf/MenuSerializer.kt b/plugin/src/main/kotlin/trplugins/menu/module/conf/MenuSerializer.kt
@@ -52,13 +52,15 @@ import trplugins.menu.module.display.dialog.model.DialogWidgetSpec
 import trplugins.menu.module.display.icon.Icon
 import trplugins.menu.module.display.icon.IconProperty
 import trplugins.menu.module.display.icon.Position
+import trplugins.menu.module.display.item.DisplayEnchant
 import trplugins.menu.module.display.item.Item
 import trplugins.menu.module.display.item.Lore
 import trplugins.menu.module.display.item.Meta
 import trplugins.menu.module.display.layout.Layout
 import trplugins.menu.module.display.layout.MenuLayout
 import trplugins.menu.module.display.texture.Texture
 import trplugins.menu.module.internal.script.js.ScriptFunction
+import trplugins.menu.util.Regexs
 import trplugins.menu.util.bukkit.ItemMatcher
 import trplugins.menu.util.collections.CycleList
 import trplugins.menu.util.collections.IndivList
@@ -395,7 +397,12 @@ object MenuSerializer : ISerializer {
 
             // Meta
             val amount = if (inherit.contains(Property.ICON_DISPLAY_AMOUNT)) def!!.display.meta.amount else Property.ICON_DISPLAY_AMOUNT.ofString(display, "1")
-            val shiny = if (inherit.contains(Property.ICON_DISPLAY_SHINY)) def!!.display.meta.shiny else Property.ICON_DISPLAY_SHINY.ofString(display, "false")
+            val shiny = if (inherit.contains(Property.ICON_DISPLAY_SHINY)) def!!.display.meta.shiny else parseDisplayShiny(display)
+            val enchants = if (inherit.contains(Property.ICON_DISPLAY_ENCHANT)) {
+                def!!.display.meta.enchants
+            } else {
+                parseDisplayEnchants(display)
+            }
             val flags = if (inherit.contains(Property.ICON_DISPLAY_FLAGS)) {
                 def!!.display.meta.flags
             } else Property.ICON_DISPLAY_FLAGS.ofStringList(display).mapNotNull { flag ->
@@ -458,7 +465,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, tooltipStyle, itemModel, hideTooltip, unbreakable, data)
+                Meta(amount, shiny, flags, enchants, nbt, tooltipStyle, itemModel, hideTooltip, unbreakable, data)
             )
 
             // i18n
@@ -686,6 +693,117 @@ object MenuSerializer : ISerializer {
         return major * 10000 + minor * 100 + patch
     }
 
+    private fun parseDisplayShiny(display: Configuration?): String {
+        if (display == null) {
+            return "false"
+        }
+        display.getKeys(false).firstOrNull { it.equals("shiny", true) || it.equals("glow", true) }?.let { key ->
+            return display[key].toString()
+        }
+        display.getKeys(false).firstOrNull { it.matches(Property.ICON_DISPLAY_ENCHANT.regex) }?.let { key ->
+            val value = display[key]
+            if (value is Boolean) {
+                return value.toString()
+            }
+            val content = value?.toString()?.trim().orEmpty()
+            if (content.matches(Regexs.BOOLEAN)) {
+                return content
+            }
+        }
+        return "false"
+    }
+
+    private fun parseDisplayEnchants(display: Configuration?): List<DisplayEnchant> {
+        if (display == null) {
+            return emptyList()
+        }
+        val key = display.getKeys(false).firstOrNull { it.matches(Property.ICON_DISPLAY_ENCHANT.regex) } ?: return emptyList()
+        return parseDisplayEnchantValue(display[key])
+    }
+
+    private fun parseDisplayEnchantValue(raw: Any?): List<DisplayEnchant> {
+        return when (raw) {
+            null -> emptyList()
+            is List<*> -> raw.flatMap { parseDisplayEnchantElement(it) }
+            is ConfigurationSection -> parseDisplayEnchantMap(raw.getValues(false))
+            is Map<*, *> -> parseDisplayEnchantMap(raw)
+            else -> listOfNotNull(parseDisplayEnchantString(raw.toString()))
+        }
+    }
+
+    private fun parseDisplayEnchantElement(raw: Any?): List<DisplayEnchant> {
+        return when (raw) {
+            null -> emptyList()
+            is List<*> -> raw.flatMap { parseDisplayEnchantElement(it) }
+            is ConfigurationSection -> parseDisplayEnchantMap(raw.getValues(false))
+            is Map<*, *> -> parseDisplayEnchantMap(raw)
+            else -> listOfNotNull(parseDisplayEnchantString(raw.toString()))
+        }
+    }
+
+    private fun parseDisplayEnchantMap(raw: Map<*, *>): List<DisplayEnchant> {
+        if (raw.isEmpty()) {
+            return emptyList()
+        }
+        if (isDisplayEnchantDescriptor(raw)) {
+            return listOfNotNull(parseDisplayEnchantDescriptor(raw))
+        }
+        return raw.entries.mapNotNull { (key, value) ->
+            val enchantKey = key?.toString()?.trim().orEmpty()
+            val enchantLevel = value?.toString()?.trim().orEmpty()
+            if (enchantKey.isEmpty() || enchantLevel.isEmpty()) {
+                null
+            } else {
+                DisplayEnchant(enchantKey, enchantLevel)
+            }
+        }
+    }
+
+    private fun isDisplayEnchantDescriptor(raw: Map<*, *>): Boolean {
+        return raw.keys.any { key ->
+            val content = key?.toString().orEmpty()
+            content.equals("id", true) ||
+                content.equals("key", true) ||
+                content.equals("type", true) ||
+                content.equals("enchant", true) ||
+                content.equals("enchantment", true)
+        }
+    }
+
+    private fun parseDisplayEnchantDescriptor(raw: Map<*, *>): DisplayEnchant? {
+        val enchantKey = readDisplayEnchantField(raw, "id", "key", "type", "enchant", "enchantment") ?: return null
+        val enchantLevel = readDisplayEnchantField(raw, "level", "lvl", "value", "amount") ?: "1"
+        return DisplayEnchant(enchantKey, enchantLevel)
+    }
+
+    private fun readDisplayEnchantField(raw: Map<*, *>, vararg names: String): String? {
+        return raw.entries.firstOrNull { entry -> names.any { entry.key?.toString().equals(it, true) } }
+            ?.value
+            ?.toString()
+            ?.trim()
+            ?.takeIf { it.isNotEmpty() }
+    }
+
+    private fun parseDisplayEnchantString(raw: String): DisplayEnchant? {
+        val content = raw.trim()
+        if (content.isEmpty()) {
+            return null
+        }
+        val split = content.split(Regex("[,\\s]+"), limit = 2).map { it.trim() }.filter { it.isNotEmpty() }
+        if (split.size == 2) {
+            return DisplayEnchant(split[0], split[1])
+        }
+        val lastColon = content.lastIndexOf(':')
+        if (lastColon in 1 until content.lastIndex) {
+            val enchantKey = content.substring(0, lastColon).trim()
+            val enchantLevel = content.substring(lastColon + 1).trim()
+            if (enchantKey.isNotEmpty() && enchantLevel.toIntOrNull() != null) {
+                return DisplayEnchant(enchantKey, enchantLevel)
+            }
+        }
+        return DisplayEnchant(content, "1")
+    }
+
     val line: (List<String>) -> List<String> =
         { origin -> mutableListOf<String>().also { list -> origin.forEach { list.addAll(it.split("\n")) } } }
 
diff --git a/plugin/src/main/kotlin/trplugins/menu/module/display/item/DisplayEnchant.kt b/plugin/src/main/kotlin/trplugins/menu/module/display/item/DisplayEnchant.kt
@@ -0,0 +1,31 @@
+/*
+ * *
+ *  * @author Arasple
+ *  * @date 2021/2/1 17:39
+ *
+ */
+
+package trplugins.menu.module.display.item
+
+import trplugins.menu.module.display.MenuSession
+import trplugins.menu.module.internal.script.evalScript
+import trplugins.menu.util.Regexs
+
+data class DisplayEnchant(
+    val key: String,
+    val level: String = "1"
+) {
+
+    private val isKeyDynamic = Regexs.containsPlaceholder(key)
+    private val isLevelDynamic = Regexs.containsPlaceholder(level) || level.toIntOrNull() == null
+    val isDynamic = isKeyDynamic || isLevelDynamic
+
+    fun enchantKey(session: MenuSession): String {
+        return if (isKeyDynamic) session.parse(key) else key
+    }
+
+    fun enchantLevel(session: MenuSession): Int {
+        val parsed = if (isLevelDynamic) session.parse(level) else level
+        return parsed.toIntOrNull() ?: session.placeholderPlayer.evalScript(level).asInt(1)
+    }
+}
diff --git a/plugin/src/main/kotlin/trplugins/menu/module/display/item/Item.kt b/plugin/src/main/kotlin/trplugins/menu/module/display/item/Item.kt
@@ -99,6 +99,7 @@ open class Item(
         meta.nbt(session, itemStack)?.run {
             itemStack.itemMeta = this
         }
+        meta.enchants(session, itemStack)
 
         return itemStack
     }
diff --git a/plugin/src/main/kotlin/trplugins/menu/module/display/item/Meta.kt b/plugin/src/main/kotlin/trplugins/menu/module/display/item/Meta.kt
@@ -1,25 +1,33 @@
 package trplugins.menu.module.display.item
 
+import org.bukkit.Material
 import org.bukkit.NamespacedKey
+import org.bukkit.enchantments.Enchantment
 import org.bukkit.inventory.ItemFlag
 import org.bukkit.inventory.ItemStack
+import org.bukkit.inventory.meta.EnchantmentStorageMeta
 import org.bukkit.inventory.meta.ItemMeta
+import taboolib.library.xseries.XEnchantment
 import taboolib.module.nms.ItemTag
 import taboolib.module.nms.getItemTag
 import taboolib.platform.util.ItemBuilder
 import trplugins.menu.module.display.MenuSession
 import trplugins.menu.module.internal.script.evalScript
 import trplugins.menu.util.Regexs
+import kotlin.jvm.optionals.getOrNull
 
 /**
  * @author Arasple
  * @date 2021/1/24 18:50
  * 显示物品的非动画, 支持动态的属性
  */
+
+
 class Meta(
     val amount: String,
     val shiny: String,
     val flags: Array<ItemFlag>,
+    val enchants: List<DisplayEnchant>,
     val nbt: ItemTag?,
     val tooltip: String?,
     val itemModel: String?,
@@ -30,11 +38,12 @@ class Meta(
 
     private val isAmountDynamic = amount.toIntOrNull() == null
     private val isShinyDynamic = !shiny.matches(Regexs.BOOLEAN)
+    private val isEnchantDynamic = enchants.any { it.isDynamic }
     private val isHideTooltipDynamic = !hideTooltip.matches(Regexs.BOOLEAN)
     private val isNBTDynamic = nbt != null && Regexs.containsPlaceholder(nbt.toJsonSimplified())
     private val isUnbreakableDynamic = !unbreakable.matches(Regexs.BOOLEAN)
     private val isDataDynamic = data.toIntOrNull() == null
-    val isDynamic = isAmountDynamic || isNBTDynamic || isShinyDynamic || isHideTooltipDynamic
+    val isDynamic = isAmountDynamic || isNBTDynamic || isShinyDynamic || isEnchantDynamic || isHideTooltipDynamic
 
     fun amount(session: MenuSession): Int {
         return (if (isAmountDynamic) session.parse(amount) else amount).toDoubleOrNull()?.toInt() ?: 1
@@ -53,6 +62,20 @@ class Meta(
         }
     }
 
+    fun enchants(session: MenuSession, itemStack: ItemStack) {
+        if (enchants.isEmpty()) {
+            return
+        }
+        enchants.forEach { displayEnchant ->
+            val enchant = resolveEnchantment(displayEnchant.enchantKey(session)) ?: return@forEach
+            val level = displayEnchant.enchantLevel(session)
+            if (level <= 0) {
+                return@forEach
+            }
+            applyEnchant(itemStack, enchant, level)
+        }
+    }
+
     fun nbt(session: MenuSession, itemStack: ItemStack): ItemMeta? {
         if (!nbt.isNullOrEmpty()) {
             val nbt = if (isNBTDynamic) ItemTag.fromJson(session.parse(nbt.toJson())) else nbt
@@ -105,4 +128,39 @@ class Meta(
         builder.damage = evalData
     }
 
-}
+    private fun applyEnchant(item: ItemStack, enchant: Enchantment, level: Int) {
+        if (item.type == Material.BOOK) {
+            item.type = Material.ENCHANTED_BOOK
+        }
+        if (item.hasItemMeta()) {
+            val meta = item.itemMeta ?: return
+            if (meta is EnchantmentStorageMeta) {
+                meta.addStoredEnchant(enchant, level, true)
+            } else {
+                meta.addEnchant(enchant, level, true)
+            }
+            item.itemMeta = meta
+        } else {
+            item.addUnsafeEnchantment(enchant, level)
+        }
+    }
+
+    @Suppress("DEPRECATION")
+    private fun resolveEnchantment(source: String): Enchantment? {
+        val text = source.trim()
+        if (text.isEmpty()) {
+            return null
+        }
+        XEnchantment.of(text).getOrNull()?.get()?.let { return it }
+        val namespacedKey = NamespacedKey.fromString(text.lowercase()) ?: if (':' !in text) NamespacedKey.minecraft(text.lowercase()) else null
+        if (namespacedKey != null) {
+            Enchantment.getByKey(namespacedKey)?.let { return it }
+        }
+        return Enchantment.values().firstOrNull {
+            it.name.equals(text, true) ||
+                it.key.key.equals(text, true) ||
+                it.key.toString().equals(text, true)
+        }
+    }
+
+}

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`group=me.arasple.mc.trmenu`
`2`		`-version=3.11.1`
	`2`	`+version=3.12.0`
Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,7 @@ open class Item(`
`99`	`99`	`meta.nbt(session, itemStack)?.run {`
`100`	`100`	`itemStack.itemMeta = this`
`101`	`101`	`}`
	`102`	`+ meta.enchants(session, itemStack)`
`102`	`103`
`103`	`104`	`return itemStack`
`104`	`105`	`}`