update: 尝试修复虚拟物品故障

BingZi-233 · Aug 12, 2024 · d58b843 · d58b843
1 parent 701091c
commit d58b843
Show file tree

Hide file tree

Showing 4 changed files with 244 additions and 7 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 group=online.bingzi.bilibili.video
-version=1.6.3-beta1
+version=1.6.3-beta2
 kotlin.incremental=true
 kotlin.incremental.java=true
 kotlin.caching.enabled=true

diff --git a/src/main/kotlin/online/bingzi/bilibili/video/internal/helper/ImageHelper.kt b/src/main/kotlin/online/bingzi/bilibili/video/internal/helper/ImageHelper.kt
@@ -43,13 +43,12 @@ fun String.toBufferedImage(size: Int): BufferedImage {
  * @param itemStack
  * @param slot
  */
-fun Player.sendVirtualItem(itemStack: ItemStack, slot: Int) {
+fun Player.sendVirtualItem(itemStack: ItemStack) {
     // 创建一个装载物品数据的包
     val packet = ProtocolLibrary.getProtocolManager().createPacket(PacketType.Play.Server.SET_SLOT)
 
     // 设置包中的数据
-    packet.integers.write(0, 0)  // 窗口ID，0表示主背包
-    packet.integers.write(1, slot)  // 插槽ID，指定要放置物品的插槽编号
+    packet.integers.write(1, 45)  // 插槽ID，指定要放置物品的插槽编号
 
     // 将物品堆栈放入包中
     packet.itemModifier.write(0, itemStack)

diff --git a/src/main/kotlin/online/bingzi/bilibili/video/internal/helper/MapHelper.kt b/src/main/kotlin/online/bingzi/bilibili/video/internal/helper/MapHelper.kt
@@ -0,0 +1,241 @@
+package online.bingzi.bilibili.video.internal.helper
+
+import org.bukkit.Bukkit
+import org.bukkit.entity.Player
+import org.bukkit.inventory.meta.MapMeta
+import org.bukkit.map.MapCanvas
+import org.bukkit.map.MapRenderer
+import org.bukkit.map.MapView
+import taboolib.common.platform.function.submit
+import taboolib.common.util.unsafeLazy
+import taboolib.library.reflex.Reflex.Companion.invokeMethod
+import taboolib.library.xseries.XMaterial
+import taboolib.module.nms.MinecraftVersion
+import taboolib.module.nms.nmsClass
+import taboolib.module.nms.obcClass
+import taboolib.platform.util.ItemBuilder
+import taboolib.platform.util.buildItem
+import taboolib.platform.util.modifyMeta
+import java.awt.image.BufferedImage
+import java.io.File
+import java.net.URL
+import java.util.concurrent.CompletableFuture
+import javax.imageio.ImageIO
+
+/**
+ * 创建地图画（堵塞）
+ *
+ * @param url 图像地址
+ * @param width 图像宽度
+ * @param height 图像高度
+ */
+fun buildMap(
+    url: String,
+    hand: NMSMap.Hand = NMSMap.Hand.MAIN,
+    width: Int = 128,
+    height: Int = 128,
+    builder: ItemBuilder.() -> Unit = {}
+): NMSMap {
+    return NMSMap(URL(url).openStream().use { ImageIO.read(it) }.zoomed(width, height), hand, builder)
+}
+
+/**
+ * 创建地图画（异步）
+ *
+ * @param url 图像地址
+ * @param width 图像宽度
+ * @param height 图像高度
+ */
+fun buildMap(
+    url: URL,
+    hand: NMSMap.Hand = NMSMap.Hand.MAIN,
+    width: Int = 128,
+    height: Int = 128,
+    builder: ItemBuilder.() -> Unit = {}
+): CompletableFuture<NMSMap> {
+    return CompletableFuture.supplyAsync {
+        NMSMap(url.openStream().use { ImageIO.read(it) }.zoomed(width, height), hand, builder)
+    }
+}
+
+/**
+ * 创建地图画（堵塞）
+ *
+ * @param file 图像文件
+ * @param width 图像宽度
+ * @param height 图像高度
+ */
+fun buildMap(
+    file: File,
+    hand: NMSMap.Hand = NMSMap.Hand.MAIN,
+    width: Int = 128,
+    height: Int = 128,
+    builder: ItemBuilder.() -> Unit = {}
+): NMSMap {
+    return NMSMap(ImageIO.read(file).zoomed(width, height), hand, builder)
+}
+
+/**
+ * 创建地图画（堵塞）
+ *
+ * @param image 图像对象
+ * @param width 图像宽度
+ * @param height 图像高度
+ */
+fun buildMap(
+    image: BufferedImage,
+    hand: NMSMap.Hand = NMSMap.Hand.MAIN,
+    width: Int = 128,
+    height: Int = 128,
+    builder: ItemBuilder.() -> Unit = {}
+): NMSMap {
+    return NMSMap(image.zoomed(width, height), hand, builder)
+}
+
+/**
+ * 打开地图画（异步）
+ *
+ * @param url 图像地址
+ * @param width 图像宽度
+ * @param height 图像高度
+ */
+fun Player.sendMap(
+    url: String,
+    hand: NMSMap.Hand = NMSMap.Hand.MAIN,
+    width: Int = 128,
+    height: Int = 128,
+    builder: ItemBuilder.() -> Unit = {}
+) {
+    buildMap(URL(url), hand, width, height, builder).thenAccept { it.sendTo(this) }
+}
+
+/**
+ * 打开地图画（异步）
+ *
+ * @param url 图像地址
+ * @param width 图像宽度
+ * @param height 图像高度
+ */
+fun Player.sendMap(
+    url: URL,
+    hand: NMSMap.Hand = NMSMap.Hand.MAIN,
+    width: Int = 128,
+    height: Int = 128,
+    builder: ItemBuilder.() -> Unit = {}
+) {
+    buildMap(url, hand, width, height, builder).thenAccept { it.sendTo(this) }
+}
+
+/**
+ * 打开地图画（异步）
+ *
+ * @param file 图像文件
+ * @param width 图像宽度
+ * @param height 图像高度
+ */
+fun Player.sendMap(
+    file: File,
+    hand: NMSMap.Hand = NMSMap.Hand.MAIN,
+    width: Int = 128,
+    height: Int = 128,
+    builder: ItemBuilder.() -> Unit = {}
+) {
+    buildMap(file, hand, width, height, builder).sendTo(this)
+}
+
+/**
+ * 打开地图画（异步）
+ *
+ * @param image 图像对象
+ * @param width 图像宽度
+ * @param height 图像高度
+ */
+fun Player.sendMap(
+    image: BufferedImage,
+    hand: NMSMap.Hand = NMSMap.Hand.MAIN,
+    width: Int = 128,
+    height: Int = 128,
+    builder: ItemBuilder.() -> Unit = {}
+) {
+    buildMap(image, hand, width, height, builder).sendTo(this)
+}
+
+/**
+ * 调整图片分辨率
+ * 地图最佳显示分辨率为128*128
+ */
+fun BufferedImage.zoomed(width: Int = 128, height: Int = 128): BufferedImage {
+    val tag = BufferedImage(width, height, BufferedImage.TYPE_INT_RGB)
+    tag.graphics.drawImage(this, 0, 0, width, height, null)
+    return tag
+}
+
+/**
+ * 地图发包工具
+ * 支持 1.8 - 1.17.1
+ * @author xbaimiao, sky
+ */
+class NMSMap(val image: BufferedImage, var hand: Hand = Hand.MAIN, val builder: ItemBuilder.() -> Unit = {}) {
+
+    enum class Hand {
+
+        MAIN, OFF
+    }
+
+    companion object {
+
+        val classPacketPlayOutSetSlot = nmsClass("PacketPlayOutSetSlot")
+        val classPacketPlayOutMap = nmsClass("PacketPlayOutMap")
+        val classCraftItemStack = obcClass("inventory.CraftItemStack")
+        val classMapIcon by unsafeLazy { nmsClass("MapIcon") }
+        val classMapData: Class<*> by unsafeLazy { Class.forName("net.minecraft.world.level.saveddata.maps.WorldMap\$b") }
+    }
+
+    val mapRenderer = object : MapRenderer() {
+
+        var rendered = false
+
+        override fun render(mapView: MapView, mapCanvas: MapCanvas, player: Player) {
+            if (rendered) {
+                return
+            }
+            mapCanvas.drawImage(0, 0, image)
+            rendered = true
+        }
+    }
+
+    val mapView by unsafeLazy {
+        val mapView = Bukkit.createMap(Bukkit.getWorlds()[0])
+        mapView.addRenderer(mapRenderer)
+        mapView
+    }
+
+    val mapItem by unsafeLazy {
+        val map = if (MinecraftVersion.isHigherOrEqual(MinecraftVersion.V1_13)) {
+            buildItem(XMaterial.FILLED_MAP, builder)
+        } else {
+            buildItem(XMaterial.FILLED_MAP) {
+                damage = mapView.invokeMethod<Short>("getId")!!.toInt()
+                builder(this)
+            }
+        }
+        if (MinecraftVersion.isHigherOrEqual(MinecraftVersion.V1_13)) {
+            map.modifyMeta<MapMeta> { mapView = this@NMSMap.mapView }
+        } else {
+            map
+        }
+    }
+
+    fun sendTo(player: Player) {
+        submit(delay = 3) {
+            player.sendVirtualItem(mapItem)
+        }
+    }
+
+    private fun getMainHandSlot(player: Player): Int {
+        if (hand == Hand.OFF) {
+            return 45
+        }
+        return player.inventory.heldItemSlot + 36
+    }
+}
diff --git a/src/main/kotlin/online/bingzi/bilibili/video/internal/helper/PlayerHelper.kt b/src/main/kotlin/online/bingzi/bilibili/video/internal/helper/PlayerHelper.kt
@@ -11,9 +11,6 @@ import taboolib.common.util.unsafeLazy
 import taboolib.library.reflex.Reflex.Companion.invokeMethod
 import taboolib.library.xseries.XMaterial
 import taboolib.module.nms.MinecraftVersion
-import taboolib.module.nms.NMSMap
-import taboolib.module.nms.buildMap
-import taboolib.module.nms.sendMap
 import taboolib.platform.util.ItemBuilder
 import taboolib.platform.util.buildItem
 import taboolib.platform.util.isNotAir