Skip to content

Commit 595fe9d

Browse files
Alexander01998Alexander01998
committed
Merge branch 'master' into 1.21.8-neoforge
2 parents 5436ae5 + fd59d59 commit 595fe9d

File tree

12 files changed

+144
-265
lines changed

12 files changed

+144
-265
lines changed

‎.github/workflows/check_translations.yml‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ name: Check Translations
33
on:
44
push:
55
branches-ignore:
6-
- "dependabot/**"
6+
- "dependabot/**"
77
tags-ignore:
8-
- "**"
8+
- "**"
99
paths:
10-
- "src/main/resources/assets/chestesp/lang/**.json"
11-
- "src/main/resources/intentionally_untranslated.json"
10+
- "src/main/resources/assets/chestesp/lang/**.json"
11+
- "src/main/resources/intentionally_untranslated.json"
1212
pull_request:
1313
paths:
14-
- "src/main/resources/assets/chestesp/lang/**.json"
15-
- "src/main/resources/intentionally_untranslated.json"
14+
- "src/main/resources/assets/chestesp/lang/**.json"
15+
- "src/main/resources/intentionally_untranslated.json"
1616
workflow_dispatch:
1717

1818
jobs:
@@ -23,10 +23,7 @@ jobs:
2323
- name: Checkout repository
2424
uses: actions/checkout@v5
2525

26-
- name: Set up Python 3.12
27-
uses: actions/setup-python@v5
26+
- name: Check translations
27+
uses: Wurst-Imperium/check-translations@v1
2828
with:
29-
python-version: "3.12"
30-
31-
- name: Run check_translations.py
32-
run: python scripts/check_translations.py
29+
lang-dir: "src/main/resources/assets/chestesp/lang"

‎.github/workflows/dependency_graph.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ name: Update Gradle Dependency Graph
33
on:
44
push:
55
branches:
6-
# Submitting dependency graph reports on non-default branches does nothing
7-
- "master"
6+
# Submitting dependency graph reports on non-default branches does nothing
7+
- "master"
88
tags-ignore:
9-
- "**"
9+
- "**"
1010
paths:
11-
- "gradle**"
12-
- "*.gradle"
11+
- "gradle**"
12+
- "*.gradle"
1313
workflow_dispatch:
1414

1515
permissions:

‎.github/workflows/gradle.yml‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,27 @@ name: Java CI with Gradle
33
on:
44
push:
55
branches-ignore:
6-
- "dependabot/**"
6+
- "dependabot/**"
77
tags-ignore:
8-
- "**"
8+
- "**"
99
paths:
10-
- "**.java"
11-
- "**.json"
12-
- "**.yml"
13-
- "gradle**"
14-
- "*.gradle"
15-
- "*.accesswidener"
10+
- "**.java"
11+
- "**.json"
12+
- "**.yml"
13+
- "gradle**"
14+
- "*.gradle"
15+
- "*.accesswidener"
1616
pull_request:
1717
paths:
18-
- "**.java"
19-
- "**.json"
20-
- "**.yml"
21-
- "gradle**"
22-
- "*.gradle"
23-
- "*.accesswidener"
18+
- "**.java"
19+
- "**.json"
20+
- "**.yml"
21+
- "gradle**"
22+
- "*.gradle"
23+
- "*.accesswidener"
2424
workflow_dispatch:
2525
inputs:
2626
distinct_id:
27-
description: "Automatically set by the return-dispatch action (leave blank if running manually)"
2827
required: false
2928

3029
jobs:
@@ -35,8 +34,8 @@ jobs:
3534
IMGUR_CLIENT_ID: ${{ secrets.IMGUR_CLIENT_ID }}
3635
steps:
3736

38-
- name: Echo distinct ID ${{ github.event.inputs.distinct_id }}
39-
run: echo ${{ github.event.inputs.distinct_id }}
37+
- name: Echo distinct ID ${{ inputs.distinct_id }}
38+
run: echo ${{ inputs.distinct_id }}
4039

4140
- name: Checkout repository
4241
uses: actions/checkout@v5

‎.github/workflows/multi_publish.yml‎

Lines changed: 27 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Publish Multiple Releases
2-
run-name: Publish v${{ github.event.inputs.mod_version }} build(s) from ${{ github.event.inputs.branches }}
2+
run-name: Publish v${{ inputs.mod_version }} build(s) from ${{ inputs.branches }}
33

44
on:
55
workflow_dispatch:
@@ -64,111 +64,63 @@ jobs:
6464
branch: ${{ fromJson(needs.prepare.outputs.branches) }}
6565
# TODO: Maybe also verify that the mod_version in each branch is as expected before publishing?
6666
steps:
67-
- name: Build publish inputs
68-
id: publish_inputs
69-
run: |
70-
JSON_STRING=$(cat << EOF
71-
{
72-
"close_milestone": "true",
73-
"upload_backups": "true",
74-
"publish_github": "true",
75-
"publish_curseforge": "true",
76-
"update_website": "true"
77-
}
78-
EOF
79-
)
80-
# Convert to single line and escape quotes
81-
echo "json=${JSON_STRING//$'\n'/}" >> "$GITHUB_OUTPUT"
8267
- name: Trigger publish workflow
83-
id: publish_dispatch
84-
uses: codex-/return-dispatch@v2
68+
uses: Wurst-Imperium/dispatch-and-wait@v1
8569
with:
8670
token: ${{ github.token }}
87-
owner: Wurst-Imperium
88-
repo: ChestESP
71+
owner: ${{ github.repository_owner }}
72+
repo: ${{ github.event.repository.name }}
8973
ref: ${{ matrix.branch }}
9074
workflow: publish.yml
91-
workflow_inputs: ${{ steps.publish_inputs.outputs.json }}
92-
- name: Wait for publish workflow to finish (run ${{ steps.publish_dispatch.outputs.run_id }})
93-
uses: codex-/await-remote-run@v1
94-
with:
95-
token: ${{ github.token }}
96-
owner: Wurst-Imperium
97-
repo: ChestESP
98-
run_id: ${{ steps.publish_dispatch.outputs.run_id }}
75+
workflow_inputs: |
76+
{
77+
"close_milestone": "true",
78+
"upload_backups": "true",
79+
"publish_github": "true",
80+
"publish_curseforge": "true",
81+
"update_website": "true"
82+
}
9983
run_timeout_seconds: 1800 # 30 minutes
10084

10185
announce_update:
10286
runs-on: ubuntu-latest
10387
needs: [prepare, publish_each]
10488
if: ${{ !failure() && !cancelled() && inputs.announce_update }}
10589
steps:
106-
- name: Build announcement inputs
107-
id: announce_inputs
108-
run: |
109-
JSON_STRING=$(cat << EOF
110-
{
111-
"mod": "chestesp",
112-
"mod_version": "${{ inputs.mod_version }}",
113-
"dry_run": "${{ inputs.dry_run }}"
114-
}
115-
EOF
116-
)
117-
# Convert to single line and escape quotes
118-
echo "json=${JSON_STRING//$'\n'/}" >> "$GITHUB_OUTPUT"
11990
- name: Trigger announce workflow
120-
id: announce_dispatch
121-
uses: codex-/return-dispatch@v2
91+
uses: Wurst-Imperium/dispatch-and-wait@v1
12292
with:
12393
token: ${{ secrets.WIMODS_NET_PUBLISH_TOKEN }}
12494
owner: Wurst-Imperium
12595
repo: wimods.net
12696
ref: master
12797
workflow: announce_mod_update.yml
128-
workflow_inputs: ${{ steps.announce_inputs.outputs.json }}
129-
- name: Wait for announce workflow to finish (run ${{ steps.announce_dispatch.outputs.run_id }})
130-
uses: codex-/await-remote-run@v1
131-
with:
132-
token: ${{ secrets.WIMODS_NET_PUBLISH_TOKEN }}
133-
owner: Wurst-Imperium
134-
repo: wimods.net
135-
run_id: ${{ steps.announce_dispatch.outputs.run_id }}
98+
workflow_inputs: |
99+
{
100+
"mod": "chestesp",
101+
"mod_version": "${{ inputs.mod_version }}",
102+
"dry_run": "${{ inputs.dry_run }}"
103+
}
136104
run_timeout_seconds: 600 # 10 minutes
137105

138106
announce_ports:
139107
runs-on: ubuntu-latest
140108
needs: [prepare, publish_each]
141109
if: ${{ !failure() && !cancelled() && inputs.announce_ports }}
142110
steps:
143-
- name: Build announcement inputs
144-
id: announce_inputs
145-
run: |
146-
JSON_STRING=$(cat << EOF
147-
{
148-
"mod": "chestesp",
149-
"mod_version": "${{ inputs.mod_version }}",
150-
"branches": "${{ inputs.branches }}",
151-
"dry_run": "${{ inputs.dry_run }}"
152-
}
153-
EOF
154-
)
155-
# Convert to single line and escape quotes
156-
echo "json=${JSON_STRING//$'\n'/}" >> "$GITHUB_OUTPUT"
157111
- name: Trigger announce workflow
158-
id: announce_dispatch
159-
uses: codex-/return-dispatch@v2
112+
uses: Wurst-Imperium/dispatch-and-wait@v1
160113
with:
161114
token: ${{ secrets.WIMODS_NET_PUBLISH_TOKEN }}
162115
owner: Wurst-Imperium
163116
repo: wimods.net
164117
ref: master
165118
workflow: announce_mod_ports.yml
166-
workflow_inputs: ${{ steps.announce_inputs.outputs.json }}
167-
- name: Wait for announce workflow to finish (run ${{ steps.announce_dispatch.outputs.run_id }})
168-
uses: codex-/await-remote-run@v1
169-
with:
170-
token: ${{ secrets.WIMODS_NET_PUBLISH_TOKEN }}
171-
owner: Wurst-Imperium
172-
repo: wimods.net
173-
run_id: ${{ steps.announce_dispatch.outputs.run_id }}
119+
workflow_inputs: |
120+
{
121+
"mod": "chestesp",
122+
"mod_version": "${{ inputs.mod_version }}",
123+
"branches": "${{ inputs.branches }}",
124+
"dry_run": "${{ inputs.dry_run }}"
125+
}
174126
run_timeout_seconds: 600 # 10 minutes

‎.github/workflows/publish.yml‎

Lines changed: 13 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ on:
3030
type: boolean
3131
default: false
3232
distinct_id:
33-
description: "Automatically set by the return-dispatch action (leave blank if running manually)"
3433
required: false
3534

3635
permissions:
@@ -48,8 +47,8 @@ jobs:
4847
CURSEFORGE_API_KEY: ${{ secrets.CURSEFORGE_API_KEY }}
4948
steps:
5049

51-
- name: Echo distinct ID ${{ github.event.inputs.distinct_id }}
52-
run: echo ${{ github.event.inputs.distinct_id }}
50+
- name: Echo distinct ID ${{ inputs.distinct_id }}
51+
run: echo ${{ inputs.distinct_id }}
5352

5453
- name: Checkout repository
5554
uses: actions/checkout@v5
@@ -110,39 +109,24 @@ jobs:
110109
id: website_inputs
111110
if: ${{ inputs.update_website && inputs.publish_curseforge }}
112111
run: |
113-
MOD_VERSION=$(grep "^mod_version=" gradle.properties | cut -d'=' -f2 | tr -d ' \r' | sed 's/-MC.*$//')
114-
MC_VERSION=$(grep "^minecraft_version=" gradle.properties | cut -d'=' -f2 | tr -d ' \r')
115-
JSON_STRING=$(cat << EOF
116-
{
117-
"mod": "chestesp",
118-
"modloader": "neoforge",
119-
"mod_version": "$MOD_VERSION",
120-
"mc_version": "$MC_VERSION",
121-
"file_id": "${{ steps.cf_file_id.outputs.file_id }}"
122-
}
123-
EOF
124-
)
125-
# Convert to single line and escape quotes
126-
echo "json=${JSON_STRING//$'\n'/}" >> "$GITHUB_OUTPUT"
112+
echo "mod_version=$(grep '^mod_version=' gradle.properties | cut -d'=' -f2 | tr -d ' \r' | sed 's/-MC.*$//')" >> "$GITHUB_OUTPUT"
113+
echo "mc_version=$(grep '^minecraft_version=' gradle.properties | cut -d'=' -f2 | tr -d ' \r')" >> "$GITHUB_OUTPUT"
127114
128115
- name: Trigger website update
129-
id: website_dispatch
130116
if: ${{ inputs.update_website && inputs.publish_curseforge }}
131-
uses: codex-/return-dispatch@v2
117+
uses: Wurst-Imperium/dispatch-and-wait@v1
132118
with:
133119
token: ${{ secrets.WIMODS_NET_PUBLISH_TOKEN }}
134120
owner: Wurst-Imperium
135121
repo: wimods.net
136122
ref: master
137123
workflow: add_mod_port.yml
138-
workflow_inputs: ${{ steps.website_inputs.outputs.json }}
139-
140-
- name: Wait for website update to finish (run ${{ steps.website_dispatch.outputs.run_id }})
141-
if: ${{ inputs.update_website && inputs.publish_curseforge }}
142-
uses: codex-/await-remote-run@v1
143-
with:
144-
token: ${{ secrets.WIMODS_NET_PUBLISH_TOKEN }}
145-
owner: Wurst-Imperium
146-
repo: wimods.net
147-
run_id: ${{ steps.website_dispatch.outputs.run_id }}
124+
workflow_inputs: |
125+
{
126+
"mod": "chestesp",
127+
"modloader": "neoforge",
128+
"mod_version": "${{ steps.website_inputs.outputs.mod_version }}",
129+
"mc_version": "${{ steps.website_inputs.outputs.mc_version }}",
130+
"file_id": "${{ steps.cf_file_id.outputs.file_id }}"
131+
}
148132
run_timeout_seconds: 600 # 10 minutes

‎.github/workflows/stale.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Close stale issues and pull requests
22

33
on:
44
schedule:
5-
- cron: "30 1 * * 1-5"
5+
- cron: "30 1 * * 1-5"
66

77
permissions:
88
# Both needed by the stale action.
@@ -15,7 +15,7 @@ jobs:
1515
steps:
1616

1717
- name: Run stale action
18-
uses: actions/stale@v9
18+
uses: actions/stale@v10
1919
with:
2020
stale-issue-message: |
2121
This issue has been open for a while with no recent activity. If this issue is still important to you, please add a comment within the next 7 days to keep it open. Otherwise, the issue will be automatically closed to free up time for other tasks.

‎build.gradle‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
buildscript {
22
dependencies {
3-
classpath "org.kohsuke:github-api:1.329"
3+
classpath "org.kohsuke:github-api:1.330"
44
}
55
}
66

@@ -10,9 +10,9 @@ plugins {
1010
id "idea"
1111
// NeoGradle. Check the latest version at:
1212
// https://projects.neoforged.net/neoforged/neogradle
13-
id "net.neoforged.gradle.userdev" version "7.0.190"
14-
id "net.neoforged.gradle.mixin" version "7.0.190"
15-
id "me.modmuss50.mod-publish-plugin" version "0.8.4"
13+
id "net.neoforged.gradle.userdev" version "7.0.192"
14+
id "net.neoforged.gradle.mixin" version "7.0.192"
15+
id "me.modmuss50.mod-publish-plugin" version "1.0.0"
1616
id "com.diffplug.spotless" version "7.2.1"
1717
}
1818

@@ -154,14 +154,16 @@ configurations {
154154

155155
configurations.all {
156156
resolutionStrategy {
157-
// v2.5.1, used by Minecraft 1.21.4 - 1.21.7, is vulnerable to CVE-2024-57699
157+
// v2.5.1, used by Minecraft 1.21.4 - 1.21.8, is vulnerable to CVE-2024-57699
158158
force "net.minidev:json-smart:2.5.2"
159-
// v2.13.4, used by Minecraft 1.21.4 - 1.21.7, is vulnerable to CVE-2025-52999
159+
// v2.13.4, used by Minecraft 1.21.4 - 1.21.8, is vulnerable to CVE-2025-52999
160160
force "com.fasterxml.jackson.core:jackson-core:2.15.0"
161-
// v3.17.0, used by Minecraft 1.21.4 - 1.21.7, is vulnerable to CVE-2025-48924
161+
// v3.17.0, used by Minecraft 1.21.4 - 1.21.8, is vulnerable to CVE-2025-48924
162162
force "org.apache.commons:commons-lang3:3.18.0"
163-
// v9.40, used by Minecraft 1.21.4 - 1.21.7, is vulnerable to CVE-2025-53864
163+
// v9.40, used by Minecraft 1.21.4 - 1.21.8, is vulnerable to CVE-2025-53864
164164
force "com.nimbusds:nimbus-jose-jwt:10.0.2"
165+
// v4.1.118.Final, used by Minecraft 1.21.5 - 1.21.8, is vulnerable to CVE-2025-58057
166+
force "io.netty:netty-codec:4.1.125.Final"
165167
}
166168
}
167169

0 commit comments

Comments
 (0)