Skip to content

Commit a5ed79e

Browse files
ShynixnShynixn
authored
Merge pull request #735 from Shynixn/development
Merge changes to master --release
2 parents 4c343ac + 6963ad8 commit a5ed79e

11 files changed

Lines changed: 146 additions & 61 deletions

‎.github/workflows/main.yml‎

Lines changed: 85 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,40 @@ jobs:
3535
./gradlew build pluginJars
3636
echo "RELEASE_VERSION=$(./gradlew -q printVersion)" >> $GITHUB_ENV
3737
38+
- name: Rename Artifacts
39+
if: "contains(github.event.head_commit.message, '--release') && contains(github.ref, 'master')"
40+
env:
41+
GEYSER_PASSWORD: ${{ secrets.GEYSER_PASSWORD }}
42+
run: |
43+
mv ./build/libs/blockball-${{ env.RELEASE_VERSION }}-26.1.0-latest-premium-folia.jar ./BlockBall-26.1.0-latest-Premium-Folia.jar
44+
mv ./build/libs/blockball-${{ env.RELEASE_VERSION }}-1.17.0-1.21.11-premium-folia.jar ./BlockBall-1.17.0-1.21.11-Premium-Folia.jar
45+
mv ./build/libs/blockball-${{ env.RELEASE_VERSION }}-1.8.8-1.16.5-premium.jar ./BlockBall-1.8.8-1.16.5-Premium.jar
46+
mv ./build/libs/blockball-${{ env.RELEASE_VERSION }}-1.17.0-1.21.11-premium.jar ./BlockBall-1.17.0-1.21.11-Premium.jar
47+
mv ./build/libs/blockball-${{ env.RELEASE_VERSION }}-26.1.0-latest-premium.jar ./BlockBall-26.1.0-latest-Premium.jar
48+
7z x docs/wiki/docs/resources/BlockBall-GeyserMC.7z -p${{ env.GEYSER_PASSWORD }}
49+
50+
- name: Parse Changelog
51+
if: "contains(github.event.head_commit.message, '--release') && contains(github.ref, 'master')"
52+
run: |
53+
VERSION=${{ env.RELEASE_VERSION }}
54+
CHANGES=$(awk '/^---/{exit} /^## Release /{found=1; next} found{print}' CHANGELOG.md)
55+
FOOTER=$(cat docs/footer-github.md)
56+
FOOTER="${FOOTER//<version>/$VERSION}"
57+
PATREON_FOOTER_BASIC=$(cat docs/footer-patreon-basic.md)
58+
PATREON_FOOTER_ELITE=$(cat docs/footer-patreon-elite.md)
59+
BODY="$CHANGES"$'\n'"$FOOTER"
60+
PATREON_BODY_BASIC="$CHANGES"$'\n'"$PATREON_FOOTER_BASIC"
61+
PATREON_BODY_ELITE="$CHANGES"$'\n'"$PATREON_FOOTER_ELITE"
62+
echo "RELEASE_BODY<<EOF" >> $GITHUB_ENV
63+
echo "$BODY" >> $GITHUB_ENV
64+
echo "EOF" >> $GITHUB_ENV
65+
echo "RELEASE_PATREON_BASIC<<EOF" >> $GITHUB_ENV
66+
echo "$PATREON_BODY_BASIC" >> $GITHUB_ENV
67+
echo "EOF" >> $GITHUB_ENV
68+
echo "RELEASE_PATREON_ELITE<<EOF" >> $GITHUB_ENV
69+
echo "$PATREON_BODY_ELITE" >> $GITHUB_ENV
70+
echo "EOF" >> $GITHUB_ENV
71+
3872
- name: Create Github Release
3973
if: "contains(github.event.head_commit.message, '--release') && contains(github.ref, 'master')"
4074
id: create_release
@@ -48,61 +82,6 @@ jobs:
4882
draft: true
4983
prerelease: false
5084

51-
- name: Upload BlockBall-1.8.8-1.16.5-Premium.jar
52-
if: "contains(github.event.head_commit.message, '--release') && contains(github.ref, 'master')"
53-
uses: actions/upload-release-asset@v1
54-
env:
55-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
56-
with:
57-
upload_url: ${{ steps.create_release.outputs.upload_url }}
58-
asset_path: /home/runner/work/BlockBall/BlockBall/build/libs/blockball-${{ env.RELEASE_VERSION }}-1.8.8-1.16.5-premium.jar
59-
asset_name: BlockBall-1.8.8-1.16.5-Premium.jar
60-
asset_content_type: application/jar
61-
62-
- name: Upload BlockBall-1.17.0-1.21.11-Premium.jar
63-
if: "contains(github.event.head_commit.message, '--release') && contains(github.ref, 'master')"
64-
uses: actions/upload-release-asset@v1
65-
env:
66-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
67-
with:
68-
upload_url: ${{ steps.create_release.outputs.upload_url }}
69-
asset_path: /home/runner/work/BlockBall/BlockBall/build/libs/blockball-${{ env.RELEASE_VERSION }}-1.17.0-1.21.11-premium.jar
70-
asset_name: BlockBall-1.17.0-1.21.11-Premium.jar
71-
asset_content_type: application/jar
72-
73-
- name: Upload BlockBall-1.17.0-1.21.11-Premium-Folia.jar
74-
if: "contains(github.event.head_commit.message, '--release') && contains(github.ref, 'master')"
75-
uses: actions/upload-release-asset@v1
76-
env:
77-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
78-
with:
79-
upload_url: ${{ steps.create_release.outputs.upload_url }}
80-
asset_path: /home/runner/work/BlockBall/BlockBall/build/libs/blockball-${{ env.RELEASE_VERSION }}-1.17.0-1.21.11-premium-folia.jar
81-
asset_name: BlockBall-1.17.0-1.21.11-Premium-Folia.jar
82-
asset_content_type: application/jar
83-
84-
- name: Upload BlockBall-26.1.0-latest-Premium.jar
85-
if: "contains(github.event.head_commit.message, '--release') && contains(github.ref, 'master')"
86-
uses: actions/upload-release-asset@v1
87-
env:
88-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
89-
with:
90-
upload_url: ${{ steps.create_release.outputs.upload_url }}
91-
asset_path: /home/runner/work/BlockBall/BlockBall/build/libs/blockball-${{ env.RELEASE_VERSION }}-26.1.0-latest-premium.jar
92-
asset_name: BlockBall-26.1.0-latest-Premium.jar
93-
asset_content_type: application/jar
94-
95-
- name: Upload BlockBall-26.1.0-latest-Premium-Folia.jar
96-
if: "contains(github.event.head_commit.message, '--release') && contains(github.ref, 'master')"
97-
uses: actions/upload-release-asset@v1
98-
env:
99-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
100-
with:
101-
upload_url: ${{ steps.create_release.outputs.upload_url }}
102-
asset_path: /home/runner/work/BlockBall/BlockBall/build/libs/blockball-${{ env.RELEASE_VERSION }}-26.1.0-latest-premium-folia.jar
103-
asset_name: BlockBall-26.1.0-latest-Premium-Folia.jar
104-
asset_content_type: application/jar
105-
10685
- name: Upload BlockBall-26.1.0-latest-Free.jar
10786
if: "contains(github.event.head_commit.message, '--release') && contains(github.ref, 'master')"
10887
uses: actions/upload-release-asset@v1
@@ -114,6 +93,57 @@ jobs:
11493
asset_name: BlockBall.jar
11594
asset_content_type: application/jar
11695

96+
- name: Publish Patreon Release
97+
if: "contains(github.event.head_commit.message, '--release') && contains(github.ref, 'master')"
98+
env:
99+
PAPOA_API_KEY: ${{ secrets.PAPOA_API_KEY }}
100+
PAPOA_PASSWORD: ${{ secrets.PAPOA_PASSWORD }}
101+
run: |
102+
wget -O papoa https://github.com/Shynixn/PatreonPostApi/releases/latest/download/papoa-linux-x64
103+
chmod +x papoa
104+
./papoa post create \
105+
--title "BlockBall for Folia v${{ env.RELEASE_VERSION }} (1.8.9-26.1.2)" \
106+
--content "$RELEASE_PATREON_ELITE" \
107+
--content-format text/markdown \
108+
--tier-name "Elite" \
109+
--tier-name "Legendary" \
110+
--collection-name "BlockBall" \
111+
--tag blockball \
112+
--tag minecraft \
113+
--tag plugin \
114+
--ttl-days 1 \
115+
--file ./BlockBall-26.1.0-latest-Premium-Folia.jar \
116+
--file ./BlockBall-1.17.0-1.21.11-Premium-Folia.jar \
117+
--file /home/runner/work/BlockBall/BlockBall/docs/wiki/docs/assets/title.png \
118+
--photo-attachment-file-name "title.png" \
119+
--attachment-file-name "BlockBall-26.1.0-latest-Premium-Folia.jar" \
120+
--attachment-file-name "BlockBall-1.17.0-1.21.11-Premium-Folia.jar" \
121+
--password "$PAPOA_PASSWORD"
122+
./papoa post create \
123+
--title "BlockBall v${{ env.RELEASE_VERSION }} (1.8.9-26.1.2)" \
124+
--content "$RELEASE_PATREON_BASIC" \
125+
--content-format text/markdown \
126+
--tier-name "Basic" \
127+
--tier-name "Elite" \
128+
--tier-name "Legendary" \
129+
--collection-name "BlockBall" \
130+
--tag blockball \
131+
--tag minecraft \
132+
--tag plugin \
133+
--ttl-days 1 \
134+
--file ./BlockBall-1.8.8-1.16.5-Premium.jar \
135+
--file ./BlockBall-1.17.0-1.21.11-Premium.jar \
136+
--file ./BlockBall-26.1.0-latest-Premium.jar \
137+
--file ./BlockBall-26.1.0-latest-Premium.jar \
138+
--file ./BlockBall-GeyserMC.zip \
139+
--file /home/runner/work/BlockBall/BlockBall/docs/wiki/docs/assets/title.png \
140+
--photo-attachment-file-name "title.png" \
141+
--attachment-file-name "BlockBall-1.8.8-1.16.5-Premium.jar" \
142+
--attachment-file-name "BlockBall-1.17.0-1.21.11-Premium.jar" \
143+
--attachment-file-name "BlockBall-26.1.0-latest-Premium.jar" \
144+
--attachment-file-name "BlockBall-GeyserMC.zip" \
145+
--password "$PAPOA_PASSWORD"
146+
117147
Documentation:
118148
runs-on: ubuntu-22.04
119149
if: "contains(github.ref, 'master')"

‎CHANGELOG.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Changelog
2+
3+
## Release 7.40.2
4+
5+
### Changes
6+
7+
* #734 Fix club game reference property loading
8+
9+
---
10+
11+
## Release 7.40.1
12+
13+
### Bugs/Issues
14+
15+
* #732 Replace the goal kick and corner kick detection with dedicated out areas. Take a look at the updated [wiki page](https://shynixn.github.io/BlockBall/wiki/site/game#advanced-features)

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88
}
99

1010
group = "com.github.shynixn"
11-
version = "7.40.1"
11+
version = "7.40.2"
1212

1313
repositories {
1414
mavenCentral()

‎docs/footer-github.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
2+
### BlockBall (Premium)
3+
4+
* For Minecraft 1.8.9 - 26.1
5+
* Bedrock GeyserMC resource pack (skin and ball rotation for bedrock servers)
6+
* Stats tracking (Amount of Goals, WinRate, etc.)
7+
* Supports Folia
8+
* Referee gamemode (allow referees to control the flow of the match)
9+
* Website Integration (share your games and player statistics)
10+
* Club VS Club games
11+
* Download: https://www.patreon.com/Shynixn
12+
13+
### BlockBall (Free)
14+
15+
* For Minecraft 26.1 (the free version only supports the latest Minecraft version)
16+
* Download: [BlockBall.jar](https://github.com/Shynixn/BlockBall/releases/download/<version>/BlockBall.jar)

‎docs/footer-patreon-basic.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
2+
### Downloads
3+
4+
* BlockBall-26.1.0-latest-Premium.jar (Minecraft 26.1 - latest)
5+
* BlockBall-1.17.0-1.21.11-Premium.jar (Minecraft 1.17.0 - 1.21.11)
6+
* BlockBall-1.8.8-1.16.5-Premium.jar (Minecraft 1.8.8 - 1.16.5)
7+
* BlockBall-GeyserMC.zip (Resourcepack for GeyserMC)
8+
9+
### Need help or support?
10+
11+
* Read the wiki https://shynixn.github.io/BlockBall.
12+
* I normally reply in 2 business days on [Discord](https://discord.gg/Y27tx8Y).
13+
* Link your Discord name to Patreon to get prioritized support.

‎docs/footer-patreon-elite.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
2+
### Downloads
3+
4+
* BlockBall-26.1.0-latest-Premium-Folia.jar (Minecraft 26.1 - latest)
5+
* BlockBall-1.17.0-1.21.11-Premium-Folia.jar (Minecraft 1.17.0 - 1.21.11)
6+
7+
### Need help or support?
8+
9+
* Read the wiki https://shynixn.github.io/BlockBall.
10+
* I normally reply in 2 business days on [Discord](https://discord.gg/Y27tx8Y).
11+
* Link your Discord name to Patreon to get prioritized support.

‎src/main/resources/plugin-1.17.0-1.21.11-folia.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: BlockBall
2-
version: 7.40.1
2+
version: 7.40.2
33
author: Shynixn
44
main: com.github.shynixn.blockball.BlockBallPlugin
55
softdepend: [ PlaceholderAPI, LuckPerms]

‎src/main/resources/plugin-1.17.0-1.21.11.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: BlockBall
2-
version: 7.40.1
2+
version: 7.40.2
33
author: Shynixn
44
main: com.github.shynixn.blockball.BlockBallPlugin
55
softdepend: [ PlaceholderAPI, LuckPerms]

‎src/main/resources/plugin-1.8.8-1.16.5.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: BlockBall
2-
version: 7.40.1
2+
version: 7.40.2
33
author: Shynixn
44
main: com.github.shynixn.blockball.BlockBallPlugin
55
softdepend: [ PlaceholderAPI, LuckPerms]

‎src/main/resources/plugin-26.1.0-latest-folia.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: BlockBall
2-
version: 7.40.1
2+
version: 7.40.2
33
author: Shynixn
44
main: com.github.shynixn.blockball.BlockBallPlugin
55
softdepend: [ PlaceholderAPI, LuckPerms]

0 commit comments

Comments
 (0)