Skip to content

Commit 5b0d2d1

Browse files
EastArcticaEastArctica
authored
Merge pull request #4 from JsMacrosCE/rebrand
Rebrand to JsMacros Community Edition
2 parents 4aed445 + 4ceb3b9 commit 5b0d2d1

File tree

698 files changed

+4069
-4576
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

698 files changed

+4069
-4576
lines changed

‎.github/FUNDING.yml‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎.github/workflows/beta.yml‎

Lines changed: 20 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
env:
1414
JAVA_VERSION: '21'
1515
MODRINTH_PROJECT: 2m9WfquA
16-
MOD_ID: jsmacros
16+
MOD_ID: jsmacrosce
1717

1818
permissions:
1919
contents: write
@@ -24,6 +24,7 @@ jobs:
2424
outputs:
2525
mod_version: ${{ steps.versions.outputs.mod_version }}
2626
mc_versions: ${{ steps.versions.outputs.mc_versions }}
27+
mc_versions_list: ${{ steps.versions.outputs.mc_versions_list }}
2728
gradle_args: ${{ steps.versions.outputs.gradle_args }}
2829
steps:
2930
- name: Checkout
@@ -38,6 +39,8 @@ jobs:
3839

3940
- name: Setup Gradle
4041
uses: gradle/actions/setup-gradle@v5
42+
with:
43+
cache-overwrite-existing: true
4144

4245
- name: Compute versions
4346
id: versions
@@ -49,68 +52,28 @@ jobs:
4952
fi
5053
MOD_VERSION=$(./gradlew -q printVersion $ARGS | tail -1 | tr -d '\n\r')
5154
MC_VERSIONS=$(./gradlew -q printMinecraftVersion $ARGS | tail -1 | tr -d '\n\r')
52-
echo "gradle_args=$ARGS" >> "$GITHUB_OUTPUT"
53-
echo "mod_version=${MOD_VERSION}" >> "$GITHUB_OUTPUT"
54-
echo "mc_versions=${MC_VERSIONS}" >> "$GITHUB_OUTPUT"
55+
MC_VERSIONS_LIST=$(printf '%s' "${MC_VERSIONS}" | tr ',' '\n')
56+
DELIM="EOF_MC_VERSIONS"
57+
{
58+
echo "gradle_args=$ARGS"
59+
echo "mod_version=${MOD_VERSION}"
60+
echo "mc_versions=${MC_VERSIONS}"
61+
echo "mc_versions_list<<${DELIM}"
62+
echo "${MC_VERSIONS_LIST}"
63+
echo "${DELIM}"
64+
} >> "$GITHUB_OUTPUT"
5565
5666
- name: Build distribution
5767
run: ./gradlew createDist ${{ steps.versions.outputs.gradle_args }}
5868

69+
- name: Publish to Modrinth and GitHub
70+
run: ./gradlew publishMods ${{ steps.versions.outputs.gradle_args }}
71+
env:
72+
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
73+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
74+
5975
- name: Upload dist
6076
uses: actions/upload-artifact@v4
6177
with:
6278
name: beta-dist-${{ steps.versions.outputs.mod_version }}
6379
path: dist/**/*
64-
65-
publish:
66-
runs-on: ubuntu-latest
67-
needs: build
68-
steps:
69-
- name: Download dist
70-
uses: actions/download-artifact@v4
71-
with:
72-
name: beta-dist-${{ needs.build.outputs.mod_version }}
73-
path: dist
74-
75-
- name: List dist contents
76-
run: ls -R dist
77-
78-
- name: Create GitHub prerelease and upload artifacts
79-
uses: softprops/action-gh-release@v2
80-
with:
81-
tag_name: v${{ needs.build.outputs.mod_version }}-beta-${{ github.event.inputs.beta_number }}
82-
name: JsMacros ${{ needs.build.outputs.mod_version }} (beta)
83-
body: |
84-
Beta build #${{ github.event.inputs.beta_number }} for JsMacros ${{ needs.build.outputs.mod_version }}.
85-
Built game versions: ${{ needs.build.outputs.mc_versions }}
86-
files: |
87-
dist/jsmacros-*-fabric-${{ needs.build.outputs.mod_version }}.jar
88-
dist/jsmacros-*-neoforge-${{ needs.build.outputs.mod_version }}.jar
89-
dist/jsmacros-devkit-*-${{ needs.build.outputs.mod_version }}.zip
90-
dist/jsmacros-extensions-*-${{ needs.build.outputs.mod_version }}.zip
91-
dist/extensions/jsmacros-ext-*-${{ needs.build.outputs.mod_version }}.jar
92-
dist/*-source.zip
93-
fail_on_unmatched_files: false
94-
prerelease: true
95-
env:
96-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
97-
98-
- name: Publish to Modrinth
99-
uses: Kir-Antipov/[email protected]
100-
with:
101-
modrinth-id: ${{ env.MODRINTH_PROJECT }}
102-
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
103-
files: |
104-
dist/jsmacros-*-fabric-${{ needs.build.outputs.mod_version }}.jar
105-
dist/jsmacros-*-neoforge-${{ needs.build.outputs.mod_version }}.jar
106-
name: JsMacros ${{ needs.build.outputs.mod_version }} (beta)
107-
version: ${{ needs.build.outputs.mod_version }}-beta-${{ github.event.inputs.beta_number }}
108-
version-type: beta
109-
changelog: |
110-
Beta build #${{ github.event.inputs.beta_number }} for JsMacros ${{ needs.build.outputs.mod_version }}.
111-
Built game versions: ${{ needs.build.outputs.mc_versions }}
112-
loaders: |
113-
fabric
114-
neoforge
115-
game-versions: ${{ needs.build.outputs.mc_versions }}
116-
java: 21

‎.github/workflows/dev.yml‎

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ permissions:
1414
env:
1515
JAVA_VERSION: '21'
1616
MODRINTH_PROJECT: 2m9WfquA
17-
MOD_ID: jsmacros
17+
MOD_ID: jsmacrosce
1818

1919
jobs:
2020
build:
@@ -32,6 +32,8 @@ jobs:
3232

3333
- name: Setup Gradle
3434
uses: gradle/actions/setup-gradle@v5
35+
with:
36+
cache-overwrite-existing: true
3537

3638
- name: Compute versions
3739
id: versions
@@ -42,37 +44,15 @@ jobs:
4244
echo "mod_version=${MOD_VERSION}" >> "$GITHUB_OUTPUT"
4345
echo "short_sha=${SHORT_SHA}" >> "$GITHUB_OUTPUT"
4446
45-
- name: Build distribution
47+
- name: Publish to GitHub
4648
run: |
4749
SHORT_SHA=${GITHUB_SHA::7}
48-
./gradlew createDist -Pchannel=dev -Pbuild_sha=${SHORT_SHA}
50+
./gradlew publishMods -Pchannel=dev -Pbuild_sha=${SHORT_SHA}
51+
env:
52+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4953

5054
- name: Upload dist
5155
uses: actions/upload-artifact@v4
5256
with:
5357
name: dev-dist-${{ steps.versions.outputs.mod_version }}
5458
path: dist/**/*
55-
56-
- name: Publish GitHub prerelease
57-
uses: softprops/action-gh-release@v2
58-
with:
59-
tag_name: v${{ steps.versions.outputs.mod_version }}
60-
name: Dev ${{ steps.versions.outputs.mod_version }}
61-
body: |
62-
Dev build for commit ${{ github.sha }}.
63-
64-
Alpha, beta, and release builds are available on Modrinth: https://modrinth.com/mod/easts-jsmacros/versions
65-
prerelease: true
66-
generate_release_notes: false
67-
files: |
68-
dist/jsmacros-*-fabric-${{ steps.versions.outputs.mod_version }}.jar
69-
dist/jsmacros-*-neoforge-${{ steps.versions.outputs.mod_version }}.jar
70-
dist/jsmacros-devkit-*-${{ steps.versions.outputs.mod_version }}.zip
71-
dist/jsmacros-extensions-*-${{ steps.versions.outputs.mod_version }}.zip
72-
dist/extensions/jsmacros-ext-*-${{ steps.versions.outputs.mod_version }}.jar
73-
dist/*-source.zip
74-
fail_on_unmatched_files: false
75-
token: ${{ secrets.GITHUB_TOKEN }}
76-
env:
77-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
78-
GITHUB_REF: refs/tags/v${{ steps.versions.outputs.mod_version }}

‎.github/workflows/release.yml‎

Lines changed: 20 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
env:
1111
JAVA_VERSION: '21'
1212
MODRINTH_PROJECT: 2m9WfquA
13-
MOD_ID: jsmacros
13+
MOD_ID: jsmacrosce
1414

1515
permissions:
1616
contents: write
@@ -21,6 +21,7 @@ jobs:
2121
outputs:
2222
mod_version: ${{ steps.versions.outputs.mod_version }}
2323
mc_versions: ${{ steps.versions.outputs.mc_versions }}
24+
mc_versions_list: ${{ steps.versions.outputs.mc_versions_list }}
2425
gradle_args: ${{ steps.versions.outputs.gradle_args }}
2526
steps:
2627
- name: Checkout
@@ -35,6 +36,8 @@ jobs:
3536

3637
- name: Setup Gradle
3738
uses: gradle/actions/setup-gradle@v5
39+
with:
40+
cache-overwrite-existing: true
3841

3942
- name: Compute versions
4043
id: versions
@@ -46,67 +49,28 @@ jobs:
4649
fi
4750
MOD_VERSION=$(./gradlew -q printVersion $ARGS | tail -1 | tr -d '\n\r')
4851
MC_VERSIONS=$(./gradlew -q printMinecraftVersion $ARGS | tail -1 | tr -d '\n\r')
49-
echo "gradle_args=$ARGS" >> "$GITHUB_OUTPUT"
50-
echo "mod_version=${MOD_VERSION}" >> "$GITHUB_OUTPUT"
51-
echo "mc_versions=${MC_VERSIONS}" >> "$GITHUB_OUTPUT"
52+
MC_VERSIONS_LIST=$(printf '%s' "${MC_VERSIONS}" | tr ',' '\n')
53+
DELIM="EOF_MC_VERSIONS"
54+
{
55+
echo "gradle_args=$ARGS"
56+
echo "mod_version=${MOD_VERSION}"
57+
echo "mc_versions=${MC_VERSIONS}"
58+
echo "mc_versions_list<<${DELIM}"
59+
echo "${MC_VERSIONS_LIST}"
60+
echo "${DELIM}"
61+
} >> "$GITHUB_OUTPUT"
5262
5363
- name: Build distribution
5464
run: ./gradlew createDist ${{ steps.versions.outputs.gradle_args }}
5565

66+
- name: Publish to Modrinth and GitHub
67+
run: ./gradlew publishMods ${{ steps.versions.outputs.gradle_args }}
68+
env:
69+
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
70+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
71+
5672
- name: Upload dist
5773
uses: actions/upload-artifact@v4
5874
with:
5975
name: release-dist-${{ steps.versions.outputs.mod_version }}
6076
path: dist/**/*
61-
62-
publish:
63-
runs-on: ubuntu-latest
64-
needs: build
65-
steps:
66-
- name: Download dist
67-
uses: actions/download-artifact@v4
68-
with:
69-
name: release-dist-${{ needs.build.outputs.mod_version }}
70-
path: dist
71-
72-
- name: List dist contents
73-
run: ls -R dist
74-
75-
- name: Create GitHub release and upload artifacts
76-
uses: softprops/action-gh-release@v2
77-
with:
78-
tag_name: v${{ needs.build.outputs.mod_version }}
79-
name: JsMacros ${{ needs.build.outputs.mod_version }}
80-
body: |
81-
Release for JsMacros ${{ needs.build.outputs.mod_version }}.
82-
Built game versions: ${{ needs.build.outputs.mc_versions }}
83-
files: |
84-
dist/jsmacros-*-fabric-${{ needs.build.outputs.mod_version }}.jar
85-
dist/jsmacros-*-neoforge-${{ needs.build.outputs.mod_version }}.jar
86-
dist/jsmacros-devkit-*-${{ needs.build.outputs.mod_version }}.zip
87-
dist/jsmacros-extensions-*-${{ needs.build.outputs.mod_version }}.zip
88-
dist/extensions/jsmacros-ext-*-${{ needs.build.outputs.mod_version }}.jar
89-
dist/*-source.zip
90-
fail_on_unmatched_files: false
91-
env:
92-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
93-
94-
- name: Publish to Modrinth
95-
uses: Kir-Antipov/[email protected]
96-
with:
97-
modrinth-id: ${{ env.MODRINTH_PROJECT }}
98-
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
99-
files: |
100-
dist/jsmacros-*-fabric-${{ needs.build.outputs.mod_version }}.jar
101-
dist/jsmacros-*-neoforge-${{ needs.build.outputs.mod_version }}.jar
102-
name: JsMacros ${{ needs.build.outputs.mod_version }}
103-
version: ${{ needs.build.outputs.mod_version }}
104-
version-type: release
105-
changelog: |
106-
Release for JsMacros ${{ needs.build.outputs.mod_version }}.
107-
Built game versions: ${{ needs.build.outputs.mc_versions }}
108-
loaders: |
109-
fabric
110-
neoforge
111-
game-versions: ${{ needs.build.outputs.mc_versions }}
112-
java: 21

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,7 @@ doc/
3737
docs/web/[0-9]*
3838

3939
/META-INF/
40+
41+
# Affinity Photo
42+
*.af~lock~
43+
*.af~lock~:com.dropbox.ignored

0 commit comments

Comments
 (0)