Merge changes to master --release

Dockerfile

@@ -37,7 +37,7 @@ RUN ./gradlew build pluginJar --no-daemon
 # 4. Launch a minecraft server with jdk17 and plugin
 FROM amazoncorretto:17
 # Change to the current plugin version present in build.gradle
-ENV PLUGIN_VERSION=6.37.0
+ENV PLUGIN_VERSION=6.37.1
 # Change to the server version you want to test.
 ENV SERVER_VERSION=spigot-1.18.jar
 # Port of the Minecraft Server.

blockball-api/src/main/java/com/github/shynixn/blockball/api/persistence/entity/BallMeta.kt

@@ -17,6 +17,16 @@ interface BallMeta {
      */
     var itemNbt: String?
 
+    /**
+     * Item Type being used.
+     */
+    var itemType : String
+
+    /**
+     * Item Damage.
+     */
+    var itemDamage: Int
+
     /**
      * Is the rightclick passing the ball enabled?
      */

blockball-bukkit-plugin/src/main/java/com/github/shynixn/blockball/bukkit/logic/business/proxy/BallDesignEntity.kt

@@ -64,8 +64,8 @@ class BallDesignEntity(val entityId: Int) {
                 )
             )
             val item = Item().also {
-                it.typeName = "PLAYER_HEAD,397"
-                it.durability = 3
+                it.typeName = ball.meta.itemType
+                it.durability = ball.meta.itemDamage
             }
 
             if (ball.meta.itemNbt != null && !ball.meta.itemNbt.isNullOrEmpty()) {

blockball-bukkit-plugin/src/main/resources/plugin-legacy.yml

@@ -1,5 +1,5 @@
 name: BlockBall
-version: 6.37.0
+version: 6.37.1
 author: Shynixn
 website: https://www.spigotmc.org/members/shynixn.63455/
 main: com.github.shynixn.blockball.bukkit.BlockBallPlugin

blockball-bukkit-plugin/src/main/resources/plugin.yml

@@ -1,5 +1,5 @@
 name: BlockBall
-version: 6.37.0
+version: 6.37.1
 author: Shynixn
 website: https://www.spigotmc.org/members/shynixn.63455/
 main: com.github.shynixn.blockball.bukkit.BlockBallPlugin

blockball-core/src/main/java/com/github/shynixn/blockball/core/logic/persistence/entity/BallMetaEntity.kt

@@ -48,6 +48,18 @@ class BallMetaEntity(
     @YamlSerialize(orderNumber = 2, value = "item-nbt")
     override var itemNbt: String? = ""
 
+    /**
+     * Item Type being used.
+     */
+    @YamlSerialize(orderNumber = 2, value = "item-type")
+    override var itemType: String = "PLAYER_HEAD,397"
+
+    /**
+     * Item Damage.
+     */
+    @YamlSerialize(orderNumber = 2, value = "item-damage")
+    override var itemDamage: Int = 3
+
     /**
      * If set to true, the slime is visible instead of the ball.
      */

build.gradle

@@ -44,7 +44,7 @@ tasks.register("printVersion") {
 
 subprojects {
     group 'com.github.shynixn.blockball'
-    version '6.37.0'
+    version '6.37.1'
 
     sourceCompatibility = 1.8
 

docs/source/conf.py

@@ -55,9 +55,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '6.37.0'
+version = '6.31.0'
 # The full version, including alpha/beta/rc tags.
-release = '6.37.0'
+release = '6.31.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.