Merge pull request #495 from Shynixn/development

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.41.0
+ENV PLUGIN_VERSION=6.42.0
 # Change to the server version you want to test.
 ENV SERVER_VERSION=spigot-1.18.jar
 # Port of the Minecraft Server.

README.md

@@ -1,10 +1,11 @@
-# BlockBall  [![Build Status](https://maven-badges.herokuapp.com/maven-central/com.github.shynixn.blockball/blockball-api/badge.svg?style=flat-square)](https://maven-badges.herokuapp.com/maven-central/com.github.shynixn.blockball/blockball-api) [![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat-square)](https://raw.githubusercontent.com/Shynixn/BlockBall/master/LICENSE)
+# BlockBall
 
 
-| branch        | status        |  version | download |
-| ------------- | ------------- |  --------| ---------| 
-| master        | [![Build Status](https://github.com/Shynixn/BlockBall/workflows/CI/badge.svg?branch=master)](https://github.com/Shynixn/BlockBall/actions) | ![GitHub license](https://img.shields.io/nexus/r/https/oss.sonatype.org/com.github.shynixn.blockball/blockball-bukkit-plugin.svg?style=flat-square)  |[Download latest release](https://github.com/Shynixn/BlockBall/releases)|
-| development   | [![Build Status](https://github.com/Shynixn/BlockBall/workflows/CI/badge.svg?branch=development)](https://github.com/Shynixn/BlockBall/actions)|![GitHub license](https://img.shields.io/nexus/s/https/oss.sonatype.org/com.github.shynixn.blockball/blockball-bukkit-plugin.svg?style=flat-square) |  [Download snapshots](https://oss.sonatype.org/content/repositories/snapshots/com/github/shynixn/blockball/blockball-bukkit-plugin/) |
+| branch        | status        |  download |
+| ------------- | ------------- |   ---------| 
+| master        | [![Build Status](https://github.com/Shynixn/BlockBall/workflows/CI/badge.svg?branch=master)](https://github.com/Shynixn/BlockBall/actions)   |[Download latest release](https://github.com/Shynixn/BlockBall/releases)|
+| development        | [![Build Status](https://github.com/Shynixn/BlockBall/workflows/CI/badge.svg?branch=master)](https://github.com/Shynixn/BlockBall/actions)   ||
+
 ## Description
 
 BlockBall is a spigot plugin to play soccer games in Minecraft.

build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "com.github.shynixn"
-version = "6.41.0"
+version = "6.42.0"
 
 repositories {
     mavenLocal()
@@ -32,20 +32,20 @@ dependencies {
 
     // Library dependencies with legacy compatibility, we can use more up-to-date version in the plugin.yml
     implementation("com.github.shynixn.org.bstats:bstats-bukkit:1.7")
-    implementation("org.slf4j:slf4j-jdk14:1.7.25")
-    implementation("com.google.inject:guice:5.0.1")
-    implementation("commons-io:commons-io:2.6")
-    implementation("com.google.code.gson:gson:2.8.6")
     implementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-api:2.13.0")
     implementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-core:2.13.0")
     implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.3.0")
     implementation("com.fasterxml.jackson.core:jackson-databind:2.2.3")
+    implementation("com.google.inject:guice:5.0.1")
+    implementation("com.google.code.gson:gson:2.8.6")
+    implementation("com.zaxxer:HikariCP:4.0.3")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2")
 
     // Custom dependencies
-    implementation("com.github.shynixn.mcutils:common:1.0.61")
-    implementation("com.github.shynixn.mcutils:packet:1.0.82")
+    implementation("com.github.shynixn.mcutils:common:1.0.65")
+    implementation("com.github.shynixn.mcutils:packet:1.0.86")
     implementation("com.github.shynixn.mcutils:sign:1.0.17")
+    implementation("com.github.shynixn.mcutils:database:1.0.22")
 }
 
 tasks.test {
@@ -135,6 +135,7 @@ tasks.register("pluginJarLegacy", ShadowJar::class.java) {
     exclude("com/google/**")
     exclude("com/github/shynixn/mcutils/**")
     exclude("com/github/shynixn/mccoroutine/**")
+    exclude("com/zaxxer/**")
     exclude("plugin-legacy.yml")
 }
 
@@ -158,6 +159,14 @@ tasks.register("pluginJarLatest", ShadowJar::class.java) {
     archiveName = "${baseName}-${version}-latest.${extension}"
     // destinationDir = File("C:\\temp\\plugins")
 
+    exclude("com/github/shynixn/blockball/lib/com/github/shynixn/mcutils/packet/nms/v1_8_R3/**")
+    exclude("com/github/shynixn/blockball/lib/com/github/shynixn/mcutils/packet/nms/v1_9_R2/**")
+    exclude("com/github/shynixn/blockball/lib/com/github/shynixn/mcutils/packet/nms/v1_18_R1/**")
+    exclude("com/github/shynixn/blockball/lib/com/github/shynixn/mcutils/packet/nms/v1_18_R2/**")
+    exclude("com/github/shynixn/blockball/lib/com/github/shynixn/mcutils/packet/nms/v1_19_R1/**")
+    exclude("com/github/shynixn/blockball/lib/com/github/shynixn/mcutils/packet/nms/v1_19_R2/**")
+    exclude("com/github/shynixn/blockball/lib/com/github/shynixn/mcutils/packet/nms/v1_19_R3/**")
+    exclude("com/github/shynixn/blockball/lib/com/github/shynixn/mcutils/packet/nms/v1_20_R1/**")
     exclude("com/github/shynixn/mcutils/**")
     exclude("com/github/shynixn/mccoroutine/**")
     exclude("org/**")
@@ -166,6 +175,7 @@ tasks.register("pluginJarLatest", ShadowJar::class.java) {
     exclude("javax/**")
     exclude("com/google/**")
     exclude("com/fasterxml/**")
+    exclude("com/zaxxer/**")
     exclude("plugin-legacy.yml")
 }