Skip to content

Commit 4414942

Browse files
committed
let it be so for now
2 parents 74caba1 + a01e729 commit 4414942

1,240 files changed

Lines changed: 25717 additions & 49451 deletions

File tree

Some content is hidden

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

.editorconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
root = true
2+
3+
[*]
4+
indent_size = 4
5+
indent_style = space

.github/ISSUE_TEMPLATE/000-report-bug.yml

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ body:
1515
attributes:
1616
label: Cleanroom Version
1717
description: "What version of the Cleanroom are you using?"
18-
placeholder: "Example: 15.24.0.3000"
18+
placeholder: "Example: 0.2.4-alpha"
1919
validations:
2020
required: true
2121
- type: dropdown
@@ -25,13 +25,11 @@ body:
2525
description: What Java version are you using? It's worth mentioning that if you play on Java9+ you should try update to latest minor release (e.g. prefer Java 17.0.6 over 17.0.2) of that version.
2626
options:
2727
- Java 8
28-
- Java 9
29-
- Java 11
30-
- Java 17
31-
- Java 19
32-
- Java 20
3328
- Java 21
3429
- Java 22
30+
- Java 23
31+
- Java 24
32+
- Java 25 (Early Access)
3533
- Other (Please Specify)
3634
validations:
3735
required: true
@@ -65,14 +63,6 @@ body:
6563
placeholder: "List of mods goes here"
6664
validations:
6765
required: true
68-
- type: textarea
69-
id: notes
70-
attributes:
71-
label: MMC Instance Notes
72-
description: "Obtain from Notes sections if using MMC instance pack."
73-
placeholder: "Notes goes here"
74-
validations:
75-
required: true
7666
- type: checkboxes
7767
id: final
7868
attributes:
@@ -81,11 +71,17 @@ body:
8171
options:
8272
- label: "I have searched the issues and haven't found a similar issue."
8373
required: true
84-
- label: "I have read the known incompatibilities and this is not related to one of those."
74+
- label: "I have read the readme and know that what is action build."
75+
required: true
76+
- label: "I have installed [Fugue](https://www.curseforge.com/minecraft/mc-mods/fugue) and it didn't fix my issue."
8577
required: true
86-
- label: "I have installed [Fugue](https://github.com/CleanroomMC/Fugue) and it does not fix this issue."
78+
- label: "I have installed [Scalar Legacy](https://www.curseforge.com/minecraft/mc-mods/scalar-legacy) and it didn't fix my issue."
8779
required: true
88-
- label: "I am using experimental branch and have installed [Scalar](https://github.com/CleanroomMC/Scalar/releases/tag/2.11.1) and it does not fix this issue."
80+
- label: "I have switched my Forgelin and LibrarianLib to continuous versions(check readme for more detail)."
8981
required: true
9082
- label: "I am running a test build from Cleanroom Github Actions. (Or, if I've compiled it myself I plan to fix the issue)"
9183
required: true
84+
- label: |
85+
I did not use PCL/PCLCE or other unsupported launchers.
86+
我没有使用 PCL/PCLCE 等其他未被支持的启动器。
87+
required: true

.github/workflows/BuildAndRelease.yml

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

.github/workflows/BuildTest.yml

Lines changed: 39 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@ name: Build and Upload Test Artifact
99

1010
on:
1111
push:
12+
paths:
13+
- 'src/**'
14+
- 'buildSrc/**'
15+
- 'patches/**'
16+
- 'build.gradle'
17+
- 'gradle.properties'
18+
- 'script/**'
19+
- '.github/**'
1220
pull_request:
1321
workflow_dispatch:
1422
inputs:
@@ -30,31 +38,20 @@ jobs:
3038
runs-on: ubuntu-latest
3139

3240
steps:
33-
- uses: actions/checkout@v4.1.4
41+
- uses: actions/checkout@v4.2.2
3442
with:
3543
fetch-tags: true
3644
fetch-depth: 0
3745

3846
- name: Set up JDK 21
39-
uses: actions/setup-java@v4.2.1
47+
uses: actions/setup-java@v4.7.1
4048
with:
4149
java-version: '21'
4250
distribution: 'temurin'
4351

44-
- name: Get branch names.
52+
- name: Get branch name
4553
id: branch-names
46-
uses: tj-actions/branch-names@v8
47-
48-
# add more feat here if required
49-
- name: Gather build info
50-
id: vars
51-
run: |
52-
BRANCH_FEAT=$(echo "${{ steps.branch-names.outputs.current_branch }}" | cut -d'/' -f1 | awk '{print tolower($0)}')
53-
if [ "$BRANCH_FEAT" = "experimental" ]; then
54-
echo "BUILD_TYPE=Experimental" >> $GITHUB_OUTPUT
55-
else
56-
echo "BUILD_TYPE=Stable" >> $GITHUB_OUTPUT
57-
fi
54+
uses: tj-actions/branch-names@v9
5855

5956
- name: Fix Gradle permission
6057
run: chmod +x ./gradlew
@@ -65,30 +62,41 @@ jobs:
6562
run: ./gradlew --stop
6663

6764
- name: Build Jars
68-
run: ./gradlew installerJar -Prun_number=${{ github.run_number }}
65+
run: ./gradlew build -Prun_number=${{ github.run_number }}
6966

7067
- name: Get version
7168
run: echo "CLEANROOM_VERSION=$(cat version.txt)" >> $GITHUB_ENV
7269

73-
- name: Upload Forge Universal
74-
uses: actions/upload-artifact@v4.3.3
70+
- name: setup python
71+
uses: actions/setup-python@v5.6.0
7572
with:
76-
name: universal-${{ env.CLEANROOM_VERSION }}
73+
python-version: '3.13'
74+
75+
- name: Generate MMC Pack
76+
run: python main.py
77+
working-directory: ./script/MMC-Builder
78+
env:
79+
PATH_TO_EXIST_INSTALLER: ../../projects/cleanroom/build/libs/cleanroom-${{ env.CLEANROOM_VERSION }}-installer.jar
80+
BRANCH: ${{ steps.branch-names.outputs.current_branch }}
81+
VERSION: ${{ env.CLEANROOM_VERSION }}
82+
83+
- name: Copy MMC Pack
84+
run: cp script/MMC-Builder/build/CleanroomMMC.zip ./projects/cleanroom/build/libs/Cleanroom-MMC-instance-${{ env.CLEANROOM_VERSION }}.zip
85+
86+
- name: Upload Universal Jar
87+
uses: actions/upload-artifact@v4.6.2
88+
with:
89+
name: universal-jar-${{ env.CLEANROOM_VERSION }}
7790
path: projects/cleanroom/build/libs/*-universal.jar
7891

79-
- name: Upload Forge Installer
80-
id: upload-job
81-
uses: actions/upload-artifact@v4.3.3
92+
- name: Upload Installer Jar
93+
uses: actions/upload-artifact@v4.6.2
8294
with:
83-
name: installer-${{ env.CLEANROOM_VERSION }}
95+
name: installer-jar-${{ env.CLEANROOM_VERSION }}
8496
path: projects/cleanroom/build/libs/*-installer.jar
85-
if-no-files-found: error
8697

87-
# - name: Repository Dispatch
88-
# if: ${{ success() && github.event_name != 'pull_request' }}
89-
# uses: peter-evans/repository-dispatch@v3
98+
# - name: Upload MMC pack zip
99+
# uses: actions/upload-artifact@v4.6.2
90100
# with:
91-
# token: ${{ secrets.CLEANROOMMC_DISPATCH_TOKEN }} # require PAT :shrug:
92-
# repository: CleanroomMC/CleanroomMMC
93-
# event-type: cleanroom_upload_artifact
94-
# client-payload: '{"commit_hash": "${{ github.sha }}", "run_job_url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}", "branch": "${{ steps.branch-names.outputs.current_branch }}", "build_type": "${{ inputs.environment || steps.vars.outputs.BUILD_TYPE }}", "actor": "${{ github.actor }}", "version": "${{ env.CLEANROOM_VERSION }}"}'
101+
# name: mmc-pack-zip-${{ env.CLEANROOM_VERSION }}
102+
# path: projects/cleanroom/build/libs/*.zip

.github/workflows/EventHandler.yml

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

.github/workflows/Publish.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: Manually Publish
2+
3+
on:
4+
workflow_dispatch:
5+
6+
jobs:
7+
8+
build:
9+
runs-on: ubuntu-latest
10+
permissions:
11+
contents: write
12+
steps:
13+
- uses: actions/checkout@v4.2.2
14+
with:
15+
fetch-tags: true
16+
fetch-depth: 0
17+
18+
- name: Set up JDK 21
19+
uses: actions/setup-java@v4.7.1
20+
with:
21+
java-version: '21'
22+
distribution: 'temurin'
23+
24+
- name: Fix Gradle permission
25+
run: chmod +x ./gradlew
26+
27+
- name: Setup Forge env
28+
run: ./gradlew setup -Prun_number=${{ github.run_number }}
29+
30+
- name: Get version
31+
run: echo "CLEANROOM_VERSION=$(cat version.txt)" >> $GITHUB_ENV
32+
33+
- name: Stop Gradle daemon
34+
run: ./gradlew --stop
35+
36+
- name: Build Jars
37+
run: ./gradlew installerJar -Prun_number=${{ github.run_number }}
38+
39+
- name: Stop Gradle daemon again
40+
run: ./gradlew --stop
41+
42+
- name: Publish to maven for mod development
43+
run: ./gradlew publish -PcleanroomUsername=${{ secrets.CLEANROOM_MAVEN_USERNAME }} -PcleanroomPassword="${{ secrets.CLEANROOM_MAVEN_PASSWORD }}" -Prun_number=${{ github.run_number }}

.github/workflows/Release.yml

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ jobs:
1212
permissions:
1313
contents: write
1414
steps:
15-
- uses: actions/checkout@v4.1.4
15+
- uses: actions/checkout@v4.2.2
1616
with:
1717
fetch-tags: true
1818
fetch-depth: 0
1919

2020
- name: Set up JDK 21
21-
uses: actions/setup-java@v4.2.1
21+
uses: actions/setup-java@v4.7.1
2222
with:
2323
java-version: '21'
2424
distribution: 'temurin'
@@ -42,32 +42,28 @@ jobs:
4242
run: ./gradlew --stop
4343

4444
- name: Publish to maven for mod development
45-
run: ./gradlew publish -PoutlandUsername=${{ secrets.MAVEN_USERNAME }} -PoutlandPassword="${{ secrets.MAVEN_PASSWORD }}" -Prun_number=${{ github.run_number }} -Prelease=true
46-
47-
- name: Checkout CleanroomMMC
48-
uses: actions/checkout@v4.1.4
49-
with:
50-
repository: CleanroomMC/CleanroomMMC
51-
path: mmc
45+
run: ./gradlew publish -PcleanroomUsername=${{ secrets.CLEANROOM_MAVEN_USERNAME }} -PcleanroomPassword="${{ secrets.CLEANROOM_MAVEN_PASSWORD }}" -Prun_number=${{ github.run_number }} -Prelease=true
5246

5347
- name: setup python
54-
uses: actions/setup-python@v5.1.0
48+
uses: actions/setup-python@v5.6.0
5549
with:
56-
python-version: '3.12'
57-
58-
- name: Install script dependencies
59-
run: |
60-
python -m pip install --upgrade pip
61-
pip install -r mmc/requirements.txt
50+
python-version: '3.13'
6251

6352
- name: Generate MMC Pack
6453
run: python main.py
65-
working-directory: ./mmc
54+
working-directory: ./script/MMC-Builder
6655
env:
67-
PATH_TO_EXIST_INSTALLER: ../projects/cleanroom/build/libs/cleanroom-${{ env.CLEANROOM_VERSION }}-installer.jar
56+
PATH_TO_EXIST_INSTALLER: ../../projects/cleanroom/build/libs/cleanroom-${{ env.CLEANROOM_VERSION }}-installer.jar
57+
BRANCH: 'main'
58+
VERSION: ${{ env.CLEANROOM_VERSION }}
6859

6960
- name: Copy MMC Pack
70-
run: cp mmc/build/CleanroomMMC.zip ./projects/cleanroom/build/libs/Cleanroom-MMC-instance-${{ env.CLEANROOM_VERSION }}.zip
61+
run: cp script/MMC-Builder/build/CleanroomMMC.zip ./projects/cleanroom/build/libs/Cleanroom-MMC-instance-${{ env.CLEANROOM_VERSION }}.zip
62+
63+
- name: Remove userdev jars
64+
run: |
65+
rm projects/cleanroom/build/libs/cleanroom-${{ env.CLEANROOM_VERSION }}-userdev.jar
66+
rm projects/cleanroom/build/libs/cleanroom-${{ env.CLEANROOM_VERSION }}-userdev-temp.jar
7167
7268
- uses: ncipollo/release-action@v1.14.0
7369
with:

0 commit comments

Comments
 (0)