From 9892a1336f79d615bc5326801f909a9026a59adf Mon Sep 17 00:00:00 2001 From: Shynixn Date: Tue, 12 Dec 2023 21:56:05 +0100 Subject: [PATCH 1/2] #476 Updated to new packet handler version. --- blockball-bukkit-plugin/build.gradle.kts | 4 ++-- .../com/github/shynixn/blockball/bukkit/BlockBallPlugin.kt | 3 ++- blockball-bukkit-plugin/src/main/resources/plugin.yml | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/blockball-bukkit-plugin/build.gradle.kts b/blockball-bukkit-plugin/build.gradle.kts index fcaeba302..30b16bfbc 100644 --- a/blockball-bukkit-plugin/build.gradle.kts +++ b/blockball-bukkit-plugin/build.gradle.kts @@ -110,8 +110,8 @@ dependencies { implementation(project(":blockball-bukkit-api")) implementation(project(":blockball-core")) - implementation("com.github.shynixn.mcutils:common:1.0.40") - implementation("com.github.shynixn.mcutils:packet:1.0.61") + implementation("com.github.shynixn.mcutils:common:1.0.41") + implementation("com.github.shynixn.mcutils:packet:1.0.65") implementation("com.github.shynixn.org.bstats:bstats-bukkit:1.7") implementation("org.slf4j:slf4j-jdk14:1.7.25") diff --git a/blockball-bukkit-plugin/src/main/java/com/github/shynixn/blockball/bukkit/BlockBallPlugin.kt b/blockball-bukkit-plugin/src/main/java/com/github/shynixn/blockball/bukkit/BlockBallPlugin.kt index ef856d42f..29c44053d 100644 --- a/blockball-bukkit-plugin/src/main/java/com/github/shynixn/blockball/bukkit/BlockBallPlugin.kt +++ b/blockball-bukkit-plugin/src/main/java/com/github/shynixn/blockball/bukkit/BlockBallPlugin.kt @@ -98,10 +98,11 @@ class BlockBallPlugin : JavaPlugin(), PluginProxy { Version.VERSION_1_19_R3, Version.VERSION_1_20_R1, Version.VERSION_1_20_R2, + Version.VERSION_1_20_R3, ) } else { arrayOf( - Version.VERSION_1_20_R2, + Version.VERSION_1_20_R3, ) } diff --git a/blockball-bukkit-plugin/src/main/resources/plugin.yml b/blockball-bukkit-plugin/src/main/resources/plugin.yml index 345234aee..d20fa7f1e 100644 --- a/blockball-bukkit-plugin/src/main/resources/plugin.yml +++ b/blockball-bukkit-plugin/src/main/resources/plugin.yml @@ -7,6 +7,7 @@ softdepend: [WorldEdit, BossBarAPI, PlaceholderAPI, Vault] libraries: - 'org.slf4j:slf4j-jdk14:1.7.25' - 'com.google.inject:guice:5.0.1' + - 'aopalliance:aopalliance:1.0' - 'commons-io:commons-io:2.6' - 'com.google.code.gson:gson:2.8.6' - 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.32' From eb38abf7c75277911336f9beed3e5f0b2832389c Mon Sep 17 00:00:00 2001 From: Shynixn Date: Fri, 15 Dec 2023 15:43:49 +0100 Subject: [PATCH 2/2] #476 Updated version. --- Dockerfile | 2 +- README.md | 2 +- .../src/main/resources/plugin-legacy.yml | 2 +- blockball-bukkit-plugin/src/main/resources/plugin.yml | 2 +- build.gradle | 2 +- docs/source/conf.py | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 78c379528..f3dcf1ca2 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.1 +ENV PLUGIN_VERSION=6.38.0 # Change to the server version you want to test. ENV SERVER_VERSION=spigot-1.18.jar # Port of the Minecraft Server. diff --git a/README.md b/README.md index 7b2a85fa9..b8c571551 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ BlockBall is a spigot plugin to play soccer games in Minecraft. * Uses blocks as balls in minecraft * Games are completely customizable -* Version support 1.8.R3 - 1.20.R2 +* Version support 1.8.R3 - 1.20.R3 * Check out the [BlockBall-Spigot-Page](https://www.spigotmc.org/resources/15320/) to get more information. ## Installation diff --git a/blockball-bukkit-plugin/src/main/resources/plugin-legacy.yml b/blockball-bukkit-plugin/src/main/resources/plugin-legacy.yml index cba573404..0a8621cfa 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.1 +version: 6.38.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 index d20fa7f1e..4ab2c731f 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.1 +version: 6.38.0 author: Shynixn website: https://www.spigotmc.org/members/shynixn.63455/ main: com.github.shynixn.blockball.bukkit.BlockBallPlugin diff --git a/build.gradle b/build.gradle index c86fbf83a..ca5fa879e 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,7 @@ tasks.register("printVersion") { subprojects { group 'com.github.shynixn.blockball' - version '6.37.1' + version '6.38.0' sourceCompatibility = 1.8 diff --git a/docs/source/conf.py b/docs/source/conf.py index 10bc7bf47..5c6ffdf13 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -47,7 +47,7 @@ # General information about the project. project = 'BlockBall' -copyright = '2015 - 2023, Shynixn' +copyright = '2015 - 2024, Shynixn' author = 'Shynixn' # The version info for the project you're documenting, acts as replacement for @@ -55,9 +55,9 @@ # built documents. # # The short X.Y version. -version = '6.31.0' +version = '6.38.0' # The full version, including alpha/beta/rc tags. -release = '6.31.0' +release = '6.38.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.