diff --git a/Dockerfile b/Dockerfile index db1288909..78c379528 100644 --- a/Dockerfile +++ b/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. 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 index 7bdb1542b..29fa5454d 100644 --- 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 @@ -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? */ diff --git a/blockball-bukkit-plugin/src/main/java/com/github/shynixn/blockball/bukkit/logic/business/proxy/BallDesignEntity.kt b/blockball-bukkit-plugin/src/main/java/com/github/shynixn/blockball/bukkit/logic/business/proxy/BallDesignEntity.kt index fb73eb0b8..3d329b953 100644 --- a/blockball-bukkit-plugin/src/main/java/com/github/shynixn/blockball/bukkit/logic/business/proxy/BallDesignEntity.kt +++ b/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()) { diff --git a/blockball-bukkit-plugin/src/main/resources/plugin-legacy.yml b/blockball-bukkit-plugin/src/main/resources/plugin-legacy.yml index 6501da3ce..cba573404 100644 --- a/blockball-bukkit-plugin/src/main/resources/plugin-legacy.yml +++ b/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 diff --git a/blockball-bukkit-plugin/src/main/resources/plugin.yml b/blockball-bukkit-plugin/src/main/resources/plugin.yml index 3ae86d46d..345234aee 100644 --- 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.37.0 +version: 6.37.1 author: Shynixn website: https://www.spigotmc.org/members/shynixn.63455/ main: com.github.shynixn.blockball.bukkit.BlockBallPlugin diff --git a/blockball-core/src/main/java/com/github/shynixn/blockball/core/logic/persistence/entity/BallMetaEntity.kt b/blockball-core/src/main/java/com/github/shynixn/blockball/core/logic/persistence/entity/BallMetaEntity.kt index 544fc1ff6..8c6735713 100644 --- a/blockball-core/src/main/java/com/github/shynixn/blockball/core/logic/persistence/entity/BallMetaEntity.kt +++ b/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. */ diff --git a/build.gradle b/build.gradle index e70aa2e29..c86fbf83a 100644 --- a/build.gradle +++ b/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 diff --git a/docs/source/conf.py b/docs/source/conf.py index 278df1c04..10bc7bf47 100644 --- a/docs/source/conf.py +++ b/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.