diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c89755549..fec54f19a 100644 --- a/.github/workflows/main.yml +++ b/.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')" diff --git a/build.gradle.kts b/build.gradle.kts index 7e755f3b6..9a6561d0a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } group = "com.github.shynixn" -version = "7.9.0" +version = "7.10.0" repositories { mavenLocal() diff --git a/docs/resources/BlockBall-GeyserMC.7z b/docs/resources/BlockBall-GeyserMC.7z new file mode 100644 index 000000000..a864f89d9 Binary files /dev/null and b/docs/resources/BlockBall-GeyserMC.7z differ diff --git a/docs/wiki/BlockBall-GeyserMC.7z b/docs/wiki/BlockBall-GeyserMC.7z new file mode 100644 index 000000000..17fea9061 Binary files /dev/null and b/docs/wiki/BlockBall-GeyserMC.7z differ diff --git a/docs/wiki/docs/bedrock.md b/docs/wiki/docs/bedrock.md new file mode 100644 index 000000000..49dae5a02 --- /dev/null +++ b/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-``. + * Extract the ``custom-skulls_blockball.yml`` into ``plugins\Geyser-\custom-skulls_blockball.yml`` + * Extract the ``packs/BlockBallPack.mcpack`` into ``plugins\Geyser-\packs\BlockBallPack.mcpack`` + * Copy the ``player-profiles`` values from ``plugins\Geyser-\custom-skulls_blockball.yml`` into the ``plugins\Geyser-\custom-skulls.yml`` file. diff --git a/docs/wiki/mkdocs.yml b/docs/wiki/mkdocs.yml index 185146e40..5b0918b92 100644 --- a/docs/wiki/mkdocs.yml +++ b/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 diff --git a/src/main/java/com/github/shynixn/blockball/entity/DoubleJumpMeta.kt b/src/main/java/com/github/shynixn/blockball/entity/DoubleJumpMeta.kt index e93b43d9c..7a7a6f8cf 100644 --- a/src/main/java/com/github/shynixn/blockball/entity/DoubleJumpMeta.kt +++ b/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 } diff --git a/src/main/resources/arena_sample.yml b/src/main/resources/arena_sample.yml index d701540fa..b6d47774b 100644 --- a/src/main/resources/arena_sample.yml +++ b/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" diff --git a/src/main/resources/plugin-legacy.yml b/src/main/resources/plugin-legacy.yml index 6567f92b4..de5aa47c9 100644 --- a/src/main/resources/plugin-legacy.yml +++ b/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 diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 993509786..ca171279d 100644 --- a/src/main/resources/plugin.yml +++ b/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