Merge pull request #559 from EmptyIrony/dev/6.2.3

修 #558 和ItemBuilder的catch

Author: Bkm016

module/bukkit/bukkit-ui/build.gradle.kts

@@ -12,6 +12,8 @@ dependencies {
     compileOnly("ink.ptms.core:v11600:11600-minimize")
     compileOnly("ink.ptms.core:v11200:11200-minimize")
     compileOnly("ink.ptms.core:v10900:10900")
+    // 降低依赖权重 避免编译报错
+    compileOnly("ink.ptms.core:v12104:12104-minimize:mapped")
     // 版本实现
     compileOnly(project(":module:bukkit:bukkit-ui:bukkit-ui-12100"))
     compileOnly(project(":module:bukkit:bukkit-ui:bukkit-ui-legacy"))

module/bukkit/bukkit-ui/src/main/kotlin/taboolib/module/ui/virtual/InventoryHandlerImpl.kt

@@ -217,7 +217,11 @@ class InventoryHandlerImpl : InventoryHandler() {
         }
 
         override fun sendCarriedChange(itemStack: ItemStack) {
-            sendSlotChange(-1, itemStack)
+            if (MinecraftVersion.versionId >= 12104) {
+                viewer.sendPacket(NMSPacketPlayOutSetCursorItem(Craft19ItemStack.asNMSCopy(itemStack)))
+            } else {
+                sendSlotChange(-1, itemStack)
+            }
         }
 
         fun sendDataChange(slot: Int, state: Int) {
@@ -438,6 +442,8 @@ private typealias NMSPacketPlayOutWindowItems = net.minecraft.network.protocol.g
 
 private typealias NMSPacketPlayOutSetSlot = net.minecraft.network.protocol.game.PacketPlayOutSetSlot
 
+private typealias NMSPacketPlayOutSetCursorItem = net.minecraft.network.protocol.game.ClientboundSetCursorItemPacket
+
 private typealias NMSPacketPlayOutWindowData = net.minecraft.network.protocol.game.PacketPlayOutWindowData
 
 private typealias NMSPacketPlayOutCloseWindow = net.minecraft.network.protocol.game.PacketPlayOutCloseWindow

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

@@ -304,12 +304,12 @@ open class ItemBuilder {
         // Tooltip Style
         try {
             itemMeta.tooltipStyle = tooltipStyle
-        } catch (_: NoSuchMethodException) {
+        } catch (_: NoSuchMethodError) {
         }
         // ItemModel
         try {
             itemMeta.itemModel = itemModel
-        } catch (_: NoSuchMethodException) {
+        } catch (_: NoSuchMethodError) {
         }
         // 唯一化
         try {
@@ -413,17 +413,17 @@ open class ItemBuilder {
             } else {
                 modelData?.getProperty<Any>("handle")?.getProperty<List<Float>>("floats")?.firstOrNull()?.cint ?: -1
             }
-        } catch (ignored: NoSuchFieldException) {
+        } catch (ignored: NoSuchMethodError) {
         }
         // Tooltip Style
         try {
             tooltipStyle = itemMeta.tooltipStyle
-        } catch (ignored: NoSuchFieldException) {
+        } catch (ignored: NoSuchMethodError) {
         }
         // ItemModel
         try {
             itemModel = itemMeta.itemModel
-        } catch (ignored: NoSuchFieldException) {
+        } catch (ignored: NoSuchMethodError) {
         }
     }
 }