Merge pull request #416 from Shynixn/development

Merge changes to master --release.
Shynixn · Oct 27, 2021 · 215d9e7 · 215d9e7
2 parents c28068e + 75093a6
commit 215d9e7
Show file tree

Hide file tree

Showing 18 changed files with 500 additions and 89 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -37,7 +37,7 @@ RUN ./gradlew build pluginJar --no-daemon
 # 4. Launch a minecraft server with jdk16 and plugin
 FROM adoptopenjdk/openjdk16
 # Change to the current plugin version present in build.gradle
-ENV PLUGIN_VERSION=6.26.0
+ENV PLUGIN_VERSION=6.27.0
 # Change to the server version you want to test.
 ENV SERVER_VERSION=1.17.1-R0.1-SNAPSHOT/spigot-1.17.1-R0.1-SNAPSHOT.jar
 # Port of the Minecraft Server.

diff --git a/blockball-api/src/main/java/com/github/shynixn/blockball/api/persistence/entity/BallMeta.kt b/blockball-api/src/main/java/com/github/shynixn/blockball/api/persistence/entity/BallMeta.kt
@@ -12,6 +12,11 @@ interface BallMeta {
      */
     var enabledKick: Boolean
 
+    /**
+     * Optional nbt applied to the item of the ball. e.g. Skull.
+     */
+    var itemNbt: String?
+
     /**
      * Is the rightclick passing the ball enabled?
      */

diff --git a/blockball-api/src/main/java/com/github/shynixn/blockball/api/persistence/entity/Item.kt b/blockball-api/src/main/java/com/github/shynixn/blockball/api/persistence/entity/Item.kt
@@ -57,4 +57,9 @@ interface Item {
      * Item skin.
      */
     var skin: String?
-}
+
+    /**
+     * Optional nbt tags.
+     */
+    var nbt: String?
+}
diff --git a/...in/java/com/github/shynixn/blockball/bukkit/logic/business/service/ItemTypeServiceImpl.kt b/...in/java/com/github/shynixn/blockball/bukkit/logic/business/service/ItemTypeServiceImpl.kt
@@ -6,6 +6,7 @@ import com.github.shynixn.blockball.api.business.enumeration.MaterialType
 import com.github.shynixn.blockball.api.business.enumeration.Version
 import com.github.shynixn.blockball.api.business.service.ItemTypeService
 import com.github.shynixn.blockball.api.persistence.entity.Item
+import com.github.shynixn.blockball.bukkit.logic.business.extension.findClazz
 import com.github.shynixn.blockball.core.logic.business.extension.translateChatColors
 import com.github.shynixn.blockball.core.logic.persistence.entity.ItemEntity
 import com.google.inject.Inject
@@ -67,7 +68,11 @@ class ItemTypeServiceImpl @Inject constructor(private val version: Version) : It
      * Converts the given item to an ItemStack.
      */
     override fun <I> toItemStack(item: Item): I {
-        val itemStack = ItemStack(findItemType(item.type), 1, item.dataValue.toShort())
+        var itemStack = ItemStack(findItemType(item.type), 1, item.dataValue.toShort())
+
+        if (item.nbt != null) {
+            itemStack = parseNBTTags(itemStack, item.nbt!!)
+        }
 
         if (itemStack.itemMeta != null) {
             var currentMeta = itemStack.itemMeta
@@ -231,4 +236,95 @@ class ItemTypeServiceImpl @Inject constructor(private val version: Version) : It
 
         throw IllegalArgumentException("Hint $sourceHint does not exist!")
     }
+
+    private fun parseNBTTags(itemStack: ItemStack, nbtText: String): ItemStack {
+        if (version.isVersionSameOrGreaterThan(Version.VERSION_1_17_R1)) {
+            val nmsItemStackClass = findClazz("net.minecraft.world.item.ItemStack")
+            val craftItemStackClass = findClazz("org.bukkit.craftbukkit.VERSION.inventory.CraftItemStack")
+            val nmsCopyMethod = craftItemStackClass.getDeclaredMethod("asNMSCopy", ItemStack::class.java)
+            val nmsToBukkitMethod = craftItemStackClass.getDeclaredMethod("asBukkitCopy", nmsItemStackClass)
+
+            val nbtTagClass = findClazz("net.minecraft.nbt.NBTTagCompound")
+            val getNBTTag = nmsItemStackClass.getDeclaredMethod("getTag")
+            val setNBTTag = nmsItemStackClass.getDeclaredMethod("setTag", nbtTagClass)
+
+            val nmsItemStack = nmsCopyMethod.invoke(null, itemStack)
+            var targetNbtTag = getNBTTag.invoke(nmsItemStack)
+
+            if (targetNbtTag == null) {
+                targetNbtTag = nbtTagClass.newInstance()
+            }
+
+            val compoundMapField = nbtTagClass.getDeclaredField("x")
+            compoundMapField.isAccessible = true
+            val targetNbtMap = compoundMapField.get(targetNbtTag) as MutableMap<Any?, Any?>
+
+            try {
+                val sourceNbtTag = findClazz(
+                    "net.minecraft.nbt.MojangsonParser"
+                )
+                    .getDeclaredMethod("parse", String::class.java).invoke(null, nbtText)
+                val sourceNbtMap = compoundMapField.get(sourceNbtTag) as MutableMap<Any?, Any?>
+
+                for (key in sourceNbtMap.keys) {
+                    targetNbtMap[key] = sourceNbtMap[key]
+                }
+
+                setNBTTag.invoke(nmsItemStack, targetNbtTag)
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+
+            return nmsToBukkitMethod.invoke(null, nmsItemStack) as ItemStack
+        } else {
+            val nmsItemStackClass =
+                Class.forName("net.minecraft.server.VERSION.ItemStack".replace("VERSION", version.bukkitId))
+            val craftItemStackClass =
+                Class.forName(
+                    "org.bukkit.craftbukkit.VERSION.inventory.CraftItemStack".replace(
+                        "VERSION",
+                        version.bukkitId
+                    )
+                )
+            val nmsCopyMethod = craftItemStackClass.getDeclaredMethod("asNMSCopy", ItemStack::class.java)
+            val nmsToBukkitMethod = craftItemStackClass.getDeclaredMethod("asBukkitCopy", nmsItemStackClass)
+
+            val nbtTagClass =
+                Class.forName("net.minecraft.server.VERSION.NBTTagCompound".replace("VERSION", version.bukkitId))
+            val getNBTTag = nmsItemStackClass.getDeclaredMethod("getTag")
+            val setNBTTag = nmsItemStackClass.getDeclaredMethod("setTag", nbtTagClass)
+
+            val nmsItemStack = nmsCopyMethod.invoke(null, itemStack)
+            var targetNbtTag = getNBTTag.invoke(nmsItemStack)
+
+            if (targetNbtTag == null) {
+                targetNbtTag = nbtTagClass.newInstance()
+            }
+
+            val compoundMapField = nbtTagClass.getDeclaredField("map")
+            compoundMapField.isAccessible = true
+            val targetNbtMap = compoundMapField.get(targetNbtTag) as MutableMap<Any?, Any?>
+
+            try {
+                val sourceNbtTag = Class.forName(
+                    "net.minecraft.server.VERSION.MojangsonParser".replace(
+                        "VERSION",
+                        version.bukkitId
+                    )
+                )
+                    .getDeclaredMethod("parse", String::class.java).invoke(null, nbtText)
+                val sourceNbtMap = compoundMapField.get(sourceNbtTag) as MutableMap<Any?, Any?>
+
+                for (key in sourceNbtMap.keys) {
+                    targetNbtMap[key] = sourceNbtMap[key]
+                }
+
+                setNBTTag.invoke(nmsItemStack, targetNbtTag)
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+
+            return nmsToBukkitMethod.invoke(null, nmsItemStack) as ItemStack
+        }
+    }
 }
diff --git a/...hynixn/blockball/bukkit/logic/business/service/nms/v1_13_R2/RayTracingService113R2Impl.kt b/...hynixn/blockball/bukkit/logic/business/service/nms/v1_13_R2/RayTracingService113R2Impl.kt
@@ -37,9 +37,19 @@ class RayTracingService113R2Impl : RayTracingService {
         val sourceLocation = position.toLocation()
 
         val directionVector = motion.toVector().normalize()
-        val distance = motion.length()
+        var distance = motion.length()
         val world = sourceLocation.world!!
 
+        sourceLocation.x = fixFiniteDomain(sourceLocation.x)
+        sourceLocation.y = fixFiniteDomain(sourceLocation.y)
+        sourceLocation.z = fixFiniteDomain(sourceLocation.z)
+        sourceLocation.yaw = fixFiniteDomain(sourceLocation.yaw.toDouble()).toFloat()
+        sourceLocation.pitch = fixFiniteDomain(sourceLocation.pitch.toDouble()).toFloat()
+        directionVector.x = fixFiniteDomain(directionVector.x)
+        directionVector.y = fixFiniteDomain(directionVector.y)
+        directionVector.z = fixFiniteDomain(directionVector.z)
+        distance = fixFiniteDomain(distance)
+
         val movingObjectPosition =
             world.rayTraceBlocks(sourceLocation, directionVector, distance, FluidCollisionMode.NEVER, false)
 

diff --git a/blockball-bukkit-plugin/src/main/resources/plugin-1.17.yml b/blockball-bukkit-plugin/src/main/resources/plugin-1.17.yml
@@ -1,5 +1,5 @@
 name: BlockBall
-version: 6.26.0
+version: 6.27.0
 author: Shynixn
 website: https://www.spigotmc.org/members/shynixn.63455/
 main: com.github.shynixn.blockball.bukkit.BlockBallPlugin

diff --git a/blockball-bukkit-plugin/src/main/resources/plugin.yml b/blockball-bukkit-plugin/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: BlockBall
-version: 6.26.0
+version: 6.27.0
 author: Shynixn
 website: https://www.spigotmc.org/members/shynixn.63455/
 main: com.github.shynixn.blockball.bukkit.BlockBallPlugin