Merge pull request #492 from Shynixn/development

Merge changes to master --release
Shynixn · Feb 24, 2024 · f52c078 · f52c078
2 parents 889578f + d86708c
commit f52c078
Show file tree

Hide file tree

Showing 387 changed files with 2,870 additions and 11,157 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -78,7 +78,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: /home/runner/work/BlockBall/BlockBall/blockball-bukkit-plugin/build/libs/blockball-bukkit-plugin-${{ env.RELEASE_VERSION }}-latest.jar
+          asset_path: /home/runner/work/BlockBall/BlockBall/build/libs/blockball-root-${{ env.RELEASE_VERSION }}-latest.jar
           asset_name: BlockBall.jar
           asset_content_type: application/jar
 
@@ -89,7 +89,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: /home/runner/work/BlockBall/BlockBall/blockball-bukkit-plugin/build/libs/blockball-bukkit-plugin-${{ env.RELEASE_VERSION }}-legacy.jar
+          asset_path: /home/runner/work/BlockBall/BlockBall/build/libs/blockball-root-${{ env.RELEASE_VERSION }}-legacy.jar
           asset_name: BlockBall-Legacy.jar
           asset_content_type: application/jar
 

diff --git 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.40.0
+ENV PLUGIN_VERSION=6.41.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/blockball-api/build.gradle.kts b/blockball-api/build.gradle.kts
diff --git a/blockball-api/src/main/java/com/github/shynixn/blockball/api/BlockBallApi.kt b/blockball-api/src/main/java/com/github/shynixn/blockball/api/BlockBallApi.kt
diff --git a/...l-api/src/main/java/com/github/shynixn/blockball/api/business/annotation/YamlSerialize.kt b/...l-api/src/main/java/com/github/shynixn/blockball/api/business/annotation/YamlSerialize.kt
diff --git a/...api/src/main/java/com/github/shynixn/blockball/api/business/enumeration/BlockDirection.kt b/...api/src/main/java/com/github/shynixn/blockball/api/business/enumeration/BlockDirection.kt
diff --git a/...kball-api/src/main/java/com/github/shynixn/blockball/api/business/enumeration/GameMode.kt b/...kball-api/src/main/java/com/github/shynixn/blockball/api/business/enumeration/GameMode.kt
diff --git a/.../main/java/com/github/shynixn/blockball/api/business/enumeration/ScoreboardDisplaySlot.kt b/.../main/java/com/github/shynixn/blockball/api/business/enumeration/ScoreboardDisplaySlot.kt
diff --git a/...l-api/src/main/java/com/github/shynixn/blockball/api/business/executor/CommandExecutor.kt b/...l-api/src/main/java/com/github/shynixn/blockball/api/business/executor/CommandExecutor.kt
diff --git a/blockball-api/src/main/java/com/github/shynixn/blockball/api/business/proxy/HologramProxy.kt b/blockball-api/src/main/java/com/github/shynixn/blockball/api/business/proxy/HologramProxy.kt
diff --git a/blockball-api/src/main/java/com/github/shynixn/blockball/api/business/proxy/PluginProxy.kt b/blockball-api/src/main/java/com/github/shynixn/blockball/api/business/proxy/PluginProxy.kt