Merge pull request #591 from Shynixn/development

Merge changes to master --release

.github/workflows/main.yml

@@ -32,6 +32,13 @@ jobs:
           ./gradlew build pluginJars
           echo "RELEASE_VERSION=$(./gradlew -q printVersion)" >> $GITHUB_ENV
 
+      - name: Create Geyser Customizations
+        if: "contains(github.event.head_commit.message, '--release') && contains(github.ref, 'master')"
+        env:
+          GEYSER_PASSWORD: ${{ secrets.GEYSER_PASSWORD }}
+        run: |
+          7z x docs/resources/BlockBall-GeyserMC.7z -p${{ env.GEYSER_PASSWORD }} 
+
       - name: Create Github Release
         if: "contains(github.event.head_commit.message, '--release') && contains(github.ref, 'master')"
         id: create_release
@@ -78,6 +85,17 @@ jobs:
           asset_name: BlockBall-Legacy.jar
           asset_content_type: application/jar
 
+      - name: Geyser Customizations to Github
+        if: "contains(github.event.head_commit.message, '--release') && contains(github.ref, 'master')"
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: /home/runner/work/BlockBall/BlockBall/BlockBall-GeyserMC.zip
+          asset_name: BlockBall-GeyserMC.zip
+          asset_content_type: application/zip
+
   Wiki:
     runs-on: ubuntu-latest
     if: "contains(github.ref, 'master')"

build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "com.github.shynixn"
-version = "7.9.0"
+version = "7.10.0"
 
 repositories {
     mavenLocal()
@@ -41,8 +41,8 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2")
 
     // Custom dependencies
-    implementation("com.github.shynixn.mcutils:common:2024.39")
-    implementation("com.github.shynixn.mcutils:packet:2024.51")
+    implementation("com.github.shynixn.mcutils:common:2024.43")
+    implementation("com.github.shynixn.mcutils:packet:2024.54")
     implementation("com.github.shynixn.mcutils:database:2024.8")
     implementation("com.github.shynixn.mcutils:sign:2024.3")
     implementation("com.github.shynixn.mcutils:guice:2024.2")

docs/wiki/docs/bedrock.md

@@ -0,0 +1,35 @@
+# Bedrock 
+
+BlockBall supports crossplay with Bedrock clients (SmartPhone,Windows,Console, etc.) using [GeyserMC](https://geysermc.org/).
+
+### Initial Setup
+
+* Install [GeyserMC](https://geysermc.org/) on your server  or on your proxy server.
+* Install BlockBall on your Spigot/Paper based server
+* Join your server with a BedRock client and join the BlockBall game ``/blockball join game1``. 
+* Observe that the ball will be displayed as a simple player_head because bedrock does not support custom player heads.
+* Observe, that the ball will not be able to rotate.
+
+### Fixing skin and rotations via GeyserMC (PatreonOnly)
+
+Thanks to my **Patreon supporters**, who have funded this feature :heart: . 
+They can download my [prepared zip file](https://www.patreon.com/Shynixn) to easily setup BlockBall for Bedrock. 
+
+If you are using the free version of BlockBall, you can still configure BlockBall for Bedrock, but it is more work for you. If you want
+to save time, become a patreon member at [https://www.patreon.com/Shynixn](https://www.patreon.com/Shynixn).
+
+=== "Spigot/Paper"
+
+    * Download the ``BlockBall-GeyserMC.zip`` file from [https://www.patreon.com/Shynixn](https://www.patreon.com/Shynixn).
+    * Extract the ``BlockBall-GeyserMC.zip`` contents into your ``plugins\Geyser-Spigot``.
+    * Extract the ``custom-skulls_blockball.yml`` into ``plugins\Geyser-Spigot\custom-skulls_blockball.yml``
+    * Extract the ``packs/BlockBallPack.mcpack`` into ``plugins\Geyser-Spigot\packs\BlockBallPack.mcpack``
+    * Copy the ``player-profiles`` values from ``plugins\Geyser-Spigot\custom-skulls_blockball.yml`` into the ``plugins\Geyser-Spigot\custom-skulls.yml`` file.
+
+=== "Proxies (BungeeCord, Velocity, etc.)"
+
+    * Download the ``BlockBall-GeyserMC.zip`` file from [https://www.patreon.com/Shynixn](https://www.patreon.com/Shynixn).
+    * Extract the ``BlockBall-GeyserMC.zip`` contents into your ``plugins\Geyser-<Proxy>``.
+    * Extract the ``custom-skulls_blockball.yml`` into ``plugins\Geyser-<Proxy>\custom-skulls_blockball.yml``
+    * Extract the ``packs/BlockBallPack.mcpack`` into ``plugins\Geyser-<Proxy>\packs\BlockBallPack.mcpack``
+    * Copy the ``player-profiles`` values from ``plugins\Geyser-<Proxy>\custom-skulls_blockball.yml`` into the ``plugins\Geyser-<Proxy>\custom-skulls.yml`` file.

docs/wiki/mkdocs.yml

@@ -8,6 +8,7 @@ nav:
       - Creating the game: game.md
       - Interactions: interaction.md
       - Signs: sign.md
+      - Bedrock: bedrock.md
       - Referee: referee.md
       - Commands: commands.md
       - PlaceHolders: placeholders.md

src/main/java/com/github/shynixn/blockball/BlockBallPlugin.kt

@@ -99,13 +99,15 @@ class BlockBallPlugin : JavaPlugin() {
         language.placeHolderFun =
             { text, player ->
                 val placeHolderService = module.getService<PlaceHolderService>()
+                val gameService = module.getService<GameService>()
                 if (player != null) {
-                    placeHolderService.replacePlaceHolders(text, player)
+                    val game = gameService.getByPlayer(player)
+                    placeHolderService.replacePlaceHolders(text, player, game)
                 } else {
                     text
                 }
             }
-        reloadTranslation(language,BlockBallLanguageImpl::class.java)
+        reloadTranslation(language, BlockBallLanguageImpl::class.java)
         logger.log(Level.INFO, "Loaded language file.")
 
         // Guice

src/main/java/com/github/shynixn/blockball/entity/DoubleJumpMeta.kt

@@ -14,7 +14,7 @@ class DoubleJumpMeta {
     /** ParticleEffect being played when activating this.*/
     /** SoundEffect being played when activating this.*/
     val soundEffect: SoundMeta = SoundMeta().also {
-        it.name = "ENTITY_GHAST_SHOOT,GHAST_FIREBALL"
+        it.name = "ENTITY_WIND_CHARGE_WIND_BURST,ENTITY_GHAST_SHOOT,GHAST_FIREBALL"
         it.pitch = 1.0
         it.volume = 10.0
     }

src/main/resources/arena_sample.yml

@@ -152,7 +152,7 @@ meta:
     horizontalStrength: 2.0
     # Sound effect to play when it is activated.
     soundEffect:
-      name: "ENTITY_GHAST_SHOOT,GHAST_FIREBALL"
+      name: "ENTITY_WIND_CHARGE_WIND_BURST,ENTITY_GHAST_SHOOT,GHAST_FIREBALL"
       pitch: 1.0
       volume: 10.0
       effectingType: "RELATED_PLAYER"

src/main/resources/plugin-legacy.yml

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

src/main/resources/plugin.yml

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