Merge fix some deprecated methods in commit 5824727 from pull request TrPlugins#398 from Teyir/stable/v3

Author: Dreeam-qwq

plugin/src/main/kotlin/trplugins/menu/api/TrMenuAPI.kt

@@ -4,6 +4,7 @@ import org.bukkit.entity.Player
 import taboolib.common.platform.function.adaptPlayer
 import taboolib.library.kether.LocalizedException
 import taboolib.module.kether.KetherShell.eval
+import taboolib.module.kether.ScriptOptions
 import trplugins.menu.module.display.Menu
 import trplugins.menu.module.internal.data.Metadata
 import trplugins.menu.module.internal.service.Performance
@@ -33,14 +34,10 @@ object TrMenuAPI {
     fun eval(player: Player, script: String): CompletableFuture<Any?> {
         Performance.check("Handler:Script:Evaluation") {
             return try {
-                eval(script, namespace = listOf("trmenu")) {
-                    sender = adaptPlayer(player)
-                    rootFrame().variables().run {
-                        Metadata.getMeta(player).data.forEach { (key, value) ->
-                            set(key, value.toString())
-                        }
-                    }
-                }
+                eval(
+                    script,
+                    ScriptOptions.builder().namespace(namespace = listOf("trmenu")).sender(adaptPlayer(player)).build()
+                )
             } catch (e: LocalizedException) {
                 println("§c[TrMenu] §8Unexpected exception while parsing kether shell:")
                 e.localizedMessage.split("\n").forEach {

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

@@ -225,7 +225,7 @@ object MenuSerializer : ISerializer {
      * Func Ⅴ. 载入图标显示部分
      */
     private val loadIconProperty: (String, IconProperty?, Configuration?, Configuration?, Configuration?, Int) -> IconProperty =
-        { id, def, it, display, action, order ->
+        { _, def, it, display, action, order ->
             val name = Property.ICON_DISPLAY_NAME.ofStringList(display)
             val texture = Property.ICON_DISPLAY_MATERIAL.ofStringList(display)
             val lore = Property.ICON_DISPLAY_LORE.ofLists(display)

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

@@ -46,7 +46,7 @@ class Meta(
 
     fun nbt(session: MenuSession, itemStack: ItemStack): ItemMeta? {
         if (!nbt.isNullOrEmpty()) {
-            val nbt = if (isNBTDynamic) ItemTag.fromLegacyJson(session.parse(nbt.toJson())) else nbt
+            val nbt = if (isNBTDynamic) ItemTag.fromJson(session.parse(nbt.toJson())) else nbt
             val tag = ItemTag()
             tag.putAll(itemStack.getItemTag())
             tag.putAll(nbt)

plugin/src/main/kotlin/trplugins/menu/module/display/texture/Texture.kt

@@ -146,48 +146,20 @@ class Texture(
 
         private fun parseMaterial(material: String): ItemStack {
             val split = material.split(":", limit = 2)
-            val data = split.getOrNull(1)?.toIntOrNull() ?: 0
             val id = split[0].toIntOrNull() ?: split[0].uppercase().replace("[ _]".toRegex(), "_")
 
 
             val item = try {
                 buildItem(XMaterial.matchXMaterial(FALL_BACK)) {
-                    if (id is Int) {
-                        try {
-                            this.material = Material::class.java.invokeMethod<Material>(
-                                "getMaterial",
-                                id.toInt(),
-                                isStatic = true
-                            )!!
-                            this.damage = data
-                        } catch (t: Throwable) {
-                            t.printStackTrace()
-                            XMaterial.matchXMaterial(id, -1).let {
-                                if (it.isPresent) {
-                                    setMaterial(it.get())
-                                    this.damage = data
-                                } else {
-                                    XMaterial.STONE
-                                }
-                            }
-                        }
-                        /*                    XMaterial.matchXMaterial(id, (-1).toByte()).let {
-                    if (it.isPresent) {
-                        setMaterial(it.get())
-                        this.damage = data
-                    } else {
-                        XMaterial.STONE
-                    }
-                }*/
-                    } else {
-                        val name = id.toString()
-                        this.material = Material.getMaterial(name)!!
-                    }
+                    val name = id.toString()
+                    this.material = Material.getMaterial(name)!!
                 }
             } catch (e: Throwable) {
-                runCatching { XMaterial.entries.find { it.name.equals(id.toString(), true) }
-                    ?: XMaterial.entries.find { it -> it.legacy.any { it == id.toString() } }
-                    ?: XMaterial.entries.maxByOrNull { similarDegree(id.toString(), it.name) } }.getOrNull()?.parseItem()
+                runCatching {
+                    XMaterial.entries.find { it.name.equals(id.toString(), true) }
+                        ?: XMaterial.entries.find { it -> it.legacy.any { it == id.toString() } }
+                        ?: XMaterial.entries.maxByOrNull { similarDegree(id.toString(), it.name) }
+                }.getOrNull()?.parseItem()
                     ?: FALL_BACK
             }