Skip to content

1.20.6 and 1.21 support #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jul 17, 2024
Merged

1.20.6 and 1.21 support #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0dae5bb
1.20.6 and 1.21 support
3arthqu4ke Jul 16, 2024
4cb5f29
Fixed 1.20.6 using Java 21 at runtime
3arthqu4ke Jul 16, 2024
3fab177
Testing out different gradle version to potentially fix java 21 on 1.…
3arthqu4ke Jul 16, 2024
3d85321
Merge branch 'main' into 1.20.6
3arthqu4ke Jul 17, 2024
4a317d5
Fixed silly input limit of 10 for reusable workflows, added more 1.21…
3arthqu4ke Jul 17, 2024
fad6478
Bump version to 2.1.0
3arthqu4ke Jul 17, 2024
4a7551e
Fixed for 1.20.6
3arthqu4ke Jul 17, 2024
5e60b66
Update README
3arthqu4ke Jul 17, 2024
f9b060c
Find out whats wrong with the gradle build
3arthqu4ke Jul 17, 2024
dcc133a
Merge branch 'main' into 1.20.6
3arthqu4ke Jul 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/local-action/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ runs:
shell: bash
- name: Download mc-runtime-test jar ${{ inputs.mc-runtime-test }}
if: ${{ inputs.mc-runtime-test != 'none' }}
run: wget -O run/mods/mc-runtime-test-${{ inputs.mc }}-2.0.0-${{ inputs.mc-runtime-test }}-release.jar https://github.com/3arthqu4ke/mc-runtime-test/releases/download/2.0.0/mc-runtime-test-${{ inputs.mc }}-2.0.0-${{ inputs.mc-runtime-test }}-release.jar
run: wget -O run/mods/mc-runtime-test-${{ inputs.mc }}-2.1.0-${{ inputs.mc-runtime-test }}-release.jar https://github.com/3arthqu4ke/mc-runtime-test/releases/download/2.1.0/mc-runtime-test-${{ inputs.mc }}-2.1.0-${{ inputs.mc-runtime-test }}-release.jar
shell: bash
- name: Download fabric-api jar ${{ inputs.fabric-api }}
if: ${{ inputs.fabric-api != 'none' }}
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/build-all-matrix-artifacts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ jobs:
matrix:
version:
- { dir: api, mc: api, lex: api, neo: api, java: 8 }
- { dir: 1_21, mc: 1.21, lex: 51.0.24, neo: 96-beta, java: 21 }
- { dir: 1_20/1_20_6, mc: 1.20.6, lex: 50.1.10, neo: 119, java: 21 }
- { dir: 1_20, mc: 1.20.4, lex: 49.0.38, neo: 219, java: 17 }
- { dir: 1_20, mc: 1.20.3, lex: 49.0.2, neo: 8-beta, java: 17 }
- { dir: 1_20, mc: 1.20.2, lex: 48.1.0, neo: 88, java: 17 }
Expand Down Expand Up @@ -36,7 +38,7 @@ jobs:
run: chmod +x gradlew
- name: Build
working-directory: ./${{ matrix.version.dir }}
run: ./gradlew build -Pminecraft_version=${{ matrix.version.mc }} -Plexforge_version=${{ matrix.version.lex }} -Pneoforge_version=${{ matrix.version.neo }}
run: ./gradlew build -Pminecraft_version=${{ matrix.version.mc }} -Plexforge_version=${{ matrix.version.lex }} -Pneoforge_version=${{ matrix.version.neo }} --stacktrace
- name: Upload ${{ matrix.version.mc }} Jars
uses: actions/upload-artifact@v4
with:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/build-all-matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ jobs:
matrix:
version:
- { dir: api, mc: api, lex: api, neo: api, java: 8 }
- { dir: 1_21, mc: 1.21, lex: 51.0.24, neo: 96-beta, java: 21 }
- { dir: 1_20/1_20_6, mc: 1.20.6, lex: 50.1.10, neo: 119, java: 21 }
- { dir: 1_20, mc: 1.20.4, lex: 49.0.38, neo: 219, java: 17 }
- { dir: 1_20, mc: 1.20.3, lex: 49.0.2, neo: 8-beta, java: 17 }
- { dir: 1_20, mc: 1.20.2, lex: 48.1.0, neo: 88, java: 17 }
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/build-all.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,7 @@ jobs:
uses: 3arthqu4ke/mc-runtime-test/.github/workflows/build-matrix-1.20.1.yml@main
build-1_20:
uses: 3arthqu4ke/mc-runtime-test/.github/workflows/build-matrix-1.20.yml@main
build-1_20_6:
uses: 3arthqu4ke/mc-runtime-test/.github/workflows/build-matrix-1.20.6.yml@main
build-1_21:
uses: 3arthqu4ke/mc-runtime-test/.github/workflows/build-matrix-1.21.yml@main
2 changes: 1 addition & 1 deletion .github/workflows/build-api.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ jobs:
- name: Build with Gradle
working-directory: ./api
run: |
./gradlew build
./gradlew build --stacktrace
2 changes: 1 addition & 1 deletion .github/workflows/build-matrix-1.12.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ jobs:
run: chmod +x gradlew
- name: Build
working-directory: ./1_12
run: ./gradlew build -Pminecraft_version=${{ matrix.version.mc }} -Plexforge_version=${{ matrix.version.lex }}
run: ./gradlew build -Pminecraft_version=${{ matrix.version.mc }} -Plexforge_version=${{ matrix.version.lex }} --stacktrace
2 changes: 1 addition & 1 deletion .github/workflows/build-matrix-1.16.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ jobs:
run: chmod +x gradlew
- name: Build
working-directory: ./1_16
run: ./gradlew build -Pminecraft_version=${{ matrix.version.mc }} -Plexforge_version=${{ matrix.version.lex }}
run: ./gradlew build -Pminecraft_version=${{ matrix.version.mc }} -Plexforge_version=${{ matrix.version.lex }} --stacktrace
2 changes: 1 addition & 1 deletion .github/workflows/build-matrix-1.17.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ jobs:
run: chmod +x gradlew
- name: Build
working-directory: ./1_17
run: ./gradlew build -Pminecraft_version=${{ matrix.version.mc }} -Plexforge_version=${{ matrix.version.lex }}
run: ./gradlew build -Pminecraft_version=${{ matrix.version.mc }} -Plexforge_version=${{ matrix.version.lex }} --stacktrace
2 changes: 1 addition & 1 deletion .github/workflows/build-matrix-1.18.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ jobs:
run: chmod +x gradlew
- name: Build
working-directory: ./1_18
run: ./gradlew build -Pminecraft_version=${{ matrix.version.mc }} -Plexforge_version=${{ matrix.version.lex }}
run: ./gradlew build -Pminecraft_version=${{ matrix.version.mc }} -Plexforge_version=${{ matrix.version.lex }} --stacktrace
2 changes: 1 addition & 1 deletion .github/workflows/build-matrix-1.19.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ jobs:
run: chmod +x gradlew
- name: Build
working-directory: ./1_19
run: ./gradlew build -Pminecraft_version=${{ matrix.version.mc }} -Plexforge_version=${{ matrix.version.lex }}
run: ./gradlew build -Pminecraft_version=${{ matrix.version.mc }} -Plexforge_version=${{ matrix.version.lex }} --stacktrace
2 changes: 1 addition & 1 deletion .github/workflows/build-matrix-1.20.1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ jobs:
run: chmod +x gradlew
- name: Build
working-directory: ./1_20/1_20_1
run: ./gradlew build -Pminecraft_version=${{ matrix.version.mc }} -Plexforge_version=${{ matrix.version.lex }}
run: ./gradlew build -Pminecraft_version=${{ matrix.version.mc }} -Plexforge_version=${{ matrix.version.lex }} --stacktrace
23 changes: 23 additions & 0 deletions .github/workflows/build-matrix-1.20.6.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Build Matrix 1.20+
on:
workflow_dispatch:
workflow_call:

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
version: [ {mc: 1.20.6, lex: 50.1.10, neo: 119} ]
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
java-version: 17
distribution: adopt
- name: Grant execute permission for gradlew
working-directory: ./1_20/1_20_6
run: chmod +x gradlew
- name: Build
working-directory: ./1_20/1_20_6
run: ./gradlew build -Pminecraft_version=${{ matrix.version.mc }} -Plexforge_version=${{ matrix.version.lex }} -Pneoforge_version=${{ matrix.version.neo }} --stacktrace
2 changes: 1 addition & 1 deletion .github/workflows/build-matrix-1.20.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ jobs:
run: chmod +x gradlew
- name: Build
working-directory: ./1_20
run: ./gradlew build -Pminecraft_version=${{ matrix.version.mc }} -Plexforge_version=${{ matrix.version.lex }} -Pneoforge_version=${{ matrix.version.neo }}
run: ./gradlew build -Pminecraft_version=${{ matrix.version.mc }} -Plexforge_version=${{ matrix.version.lex }} -Pneoforge_version=${{ matrix.version.neo }} --stacktrace
23 changes: 23 additions & 0 deletions .github/workflows/build-matrix-1.21.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Build Matrix 1.21+
on:
workflow_dispatch:
workflow_call:

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
version: [ {mc: 1.21, lex: 51.0.24, neo: 96-beta} ]
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
java-version: 21
distribution: adopt
- name: Grant execute permission for gradlew
working-directory: ./1_21
run: chmod +x gradlew
- name: Build
working-directory: ./1_21
run: ./gradlew build -Pminecraft_version=${{ matrix.version.mc }} -Plexforge_version=${{ matrix.version.lex }} -Pneoforge_version=${{ matrix.version.neo }} --stacktrace
2 changes: 1 addition & 1 deletion .github/workflows/build-matrix-1.7.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ jobs:
run: chmod +x gradlew
- name: Build
working-directory: ./1_7_10
run: ./gradlew build -Pminecraft_version=${{ matrix.version.mc }} -Plexforge_version=${{ matrix.version.lex }}
run: ./gradlew build -Pminecraft_version=${{ matrix.version.mc }} -Plexforge_version=${{ matrix.version.lex }} --stacktrace
2 changes: 1 addition & 1 deletion .github/workflows/build-matrix-1.8.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ jobs:
run: chmod +x gradlew
- name: Build
working-directory: ./1_8_9
run: ./gradlew build -Pminecraft_version=${{ matrix.version.mc }} -Plexforge_version=${{ matrix.version.lex }}
run: ./gradlew build -Pminecraft_version=${{ matrix.version.mc }} -Plexforge_version=${{ matrix.version.lex }} --stacktrace
2 changes: 1 addition & 1 deletion .github/workflows/build-specific-reusable.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ jobs:
run: chmod +x gradlew
- name: Build
working-directory: ./${{ inputs.dir }}
run: ./gradlew build -Pminecraft_version=${{ inputs.mc }} -Plexforge_version=${{ inputs.lex }} -Pneoforge_version=${{ inputs.neo }}
run: ./gradlew build -Pminecraft_version=${{ inputs.mc }} -Plexforge_version=${{ inputs.lex }} -Pneoforge_version=${{ inputs.neo }} --stacktrace
2 changes: 1 addition & 1 deletion .github/workflows/build-specific.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ jobs:
run: chmod +x gradlew
- name: Build
working-directory: ./${{ github.event.inputs.dir }}
run: ./gradlew build -Pminecraft_version=${{ github.event.inputs.mc }} -Plexforge_version=${{ github.event.inputs.lex }} -Pneoforge_version=${{ github.event.inputs.neo }}
run: ./gradlew build -Pminecraft_version=${{ github.event.inputs.mc }} -Plexforge_version=${{ github.event.inputs.lex }} -Pneoforge_version=${{ github.event.inputs.neo }} --stacktrace
2 changes: 1 addition & 1 deletion .github/workflows/fabric.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- name: Configure Accessibility
run: echo onboardAccessibility:false >> run/options.txt
- name: Build
run: ./gradlew build
run: ./gradlew build --stacktrace
- name: Copy mod
run: cp build/libs/mc-runtime-test-*-fabric-release.jar run/mods
- name: LS mods dir
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/release-all.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ jobs:
matrix:
version:
- { dir: api, mc: api, lex: api, neo: api, java: 8 }
- { dir: 1_21, mc: 1.21, lex: 51.0.24, neo: 96-beta, java: 21 }
- { dir: 1_20/1_20_6, mc: 1.20.6, lex: 50.1.10, neo: 119, java: 21 }
- { dir: 1_20, mc: 1.20.4, lex: 49.0.38, neo: 219, java: 17 }
- { dir: 1_20, mc: 1.20.3, lex: 49.0.2, neo: 8-beta, java: 17 }
- { dir: 1_20, mc: 1.20.2, lex: 48.1.0, neo: 88, java: 17 }
Expand Down Expand Up @@ -38,7 +40,7 @@ jobs:
run: chmod +x gradlew
- name: Build
working-directory: ./${{ matrix.version.dir }}
run: ./gradlew build -Pminecraft_version=${{ matrix.version.mc }} -Plexforge_version=${{ matrix.version.lex }} -Pneoforge_version=${{ matrix.version.neo }}
run: ./gradlew build -Pminecraft_version=${{ matrix.version.mc }} -Plexforge_version=${{ matrix.version.lex }} -Pneoforge_version=${{ matrix.version.neo }} --stacktrace
- name: Upload ${{ matrix.version.mc }} Jars
uses: actions/upload-artifact@v4
with:
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/run-gametests-latest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
run: chmod +x gradlew
- name: Build Gametest
working-directory: ./gametest
run: ./gradlew build
run: ./gradlew build --stacktrace
- uses: actions/upload-artifact@v4
with:
name: gametest-jars
Expand All @@ -36,7 +36,7 @@ jobs:
run: chmod +x gradlew
- name: Build latest
working-directory: ./1_20
run: ./gradlew build
run: ./gradlew build --stacktrace
- uses: actions/upload-artifact@v4
with:
name: latest-jars
Expand All @@ -47,9 +47,9 @@ jobs:
strategy:
matrix:
version:
- { dir: 1_20, mc: 1.20.4, type: lexforge, modloader: forge, regex: .*forge.*, java: 17 }
- { dir: 1_20, mc: 1.20.4, type: neoforge, modloader: neoforge, regex: .*neoforge.*, java: 17 }
- { dir: 1_20, mc: 1.20.4, type: fabric, modloader: fabric, regex: .*fabric.*, java: 17 }
- { dir: 1_20, mc: 1.20.6, type: lexforge, modloader: forge, regex: .*forge.*, java: 21 }
- { dir: 1_20, mc: 1.20.6, type: neoforge, modloader: neoforge, regex: .*neoforge.*, java: 21 }
- { dir: 1_20, mc: 1.20.6, type: fabric, modloader: fabric, regex: .*fabric.*, java: 21 }
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -58,12 +58,12 @@ jobs:
run: mkdir -p run/mods
- name: Copy mod files
run: |
cp gametest-jars/clientgametest-1.20.4-2.0.0-fabric.jar run/mods
cp gametest-jars/clientgametest-1.20.4-2.0.0-neoforge.jar run/mods
cp gametest-jars/clientgametest-1.20.4-2.0.0-lexforge.jar run/mods
cp latest-jars/mc-runtime-test-1.20.4-2.0.0-fabric-release.jar run/mods
cp latest-jars/mc-runtime-test-1.20.4-2.0.0-lexforge-release.jar run/mods
cp latest-jars/mc-runtime-test-1.20.4-2.0.0-neoforge-release.jar run/mods
cp gametest-jars/clientgametest-1.20.6-2.1.0-fabric.jar run/mods
cp gametest-jars/clientgametest-1.20.6-2.1.0-neoforge.jar run/mods
cp gametest-jars/clientgametest-1.20.6-2.1.0-lexforge.jar run/mods
cp latest-jars/mc-runtime-test-1.20.6-2.1.0-fabric-release.jar run/mods
cp latest-jars/mc-runtime-test-1.20.6-2.1.0-lexforge-release.jar run/mods
cp latest-jars/mc-runtime-test-1.20.6-2.1.0-neoforge-release.jar run/mods
- name: Run game for version
id: local-action
uses: ./.github/actions/local-action
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/run-latest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ jobs:
strategy:
matrix:
version:
- { dir: 1_20, mc: 1.20.4, type: lexforge, modloader: forge, regex: .*forge.*, java: 17 }
- { dir: 1_20, mc: 1.20.4, type: neoforge, modloader: neoforge, regex: .*neoforge.*, java: 17 }
- { dir: 1_20, mc: 1.20.4, type: fabric, modloader: fabric, regex: .*fabric.*, java: 17 }
- { dir: 1_20/1_20_6, mc: 1.20.6, type: lexforge, modloader: forge, regex: .*forge.*, java: 21 }
- { dir: 1_20/1_20_6, mc: 1.20.6, type: neoforge, modloader: neoforge, regex: .*neoforge.*, java: 21 }
- { dir: 1_20/1_20_6, mc: 1.20.6, type: fabric, modloader: fabric, regex: .*fabric.*, java: 21 }
uses: 3arthqu4ke/mc-runtime-test/.github/workflows/run-specific-reusable.yml@main
with:
dir: ${{ matrix.version.dir }}
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/run-matrix-with-hmc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ jobs:
strategy:
matrix:
version:
- { dir: 1_21, mc: 1.21, type: lexforge, modloader: forge, regex: .*forge.*, java: 21 }
- { dir: 1_21, mc: 1.21, type: neoforge, modloader: neoforge, regex: .*neoforge.*, java: 21 }
- { dir: 1_21, mc: 1.21, type: fabric, modloader: fabric, regex: .*fabric.*, java: 21 }
- { dir: 1_20/1_20_6, mc: 1.20.6, type: lexforge, modloader: forge, regex: .*forge.*, java: 21 }
- { dir: 1_20/1_20_6, mc: 1.20.6, type: neoforge, modloader: neoforge, regex: .*neoforge.*, java: 21 }
- { dir: 1_20/1_20_6, mc: 1.20.6, type: fabric, modloader: fabric, regex: .*fabric.*, java: 21 }
- { dir: 1_20, mc: 1.20.4, type: lexforge, modloader: forge, regex: .*forge.*, java: 17 }
- { dir: 1_20, mc: 1.20.4, type: neoforge, modloader: neoforge, regex: .*neoforge.*, java: 17 }
- { dir: 1_20, mc: 1.20.4, type: fabric, modloader: fabric, regex: .*fabric.*, java: 17 }
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/run-matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ jobs:
strategy:
matrix:
version:
- { dir: 1_21, mc: 1.21, type: lexforge, modloader: forge, regex: .*forge.*, java: 21 }
- { dir: 1_21, mc: 1.21, type: neoforge, modloader: neoforge, regex: .*neoforge.*, java: 21 }
- { dir: 1_21, mc: 1.21, type: fabric, modloader: fabric, regex: .*fabric.*, java: 21 }
- { dir: 1_20/1_20_6, mc: 1.20.6, type: lexforge, modloader: forge, regex: .*forge.*, java: 21 }
- { dir: 1_20/1_20_6, mc: 1.20.6, type: neoforge, modloader: neoforge, regex: .*neoforge.*, java: 21 }
- { dir: 1_20/1_20_6, mc: 1.20.6, type: fabric, modloader: fabric, regex: .*fabric.*, java: 21 }
- { dir: 1_20, mc: 1.20.4, type: lexforge, modloader: forge, regex: .*forge.*, java: 17 }
- { dir: 1_20, mc: 1.20.4, type: neoforge, modloader: neoforge, regex: .*neoforge.*, java: 17 }
- { dir: 1_20, mc: 1.20.4, type: fabric, modloader: fabric, regex: .*fabric.*, java: 17 }
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run-specific-reusable.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:
run: echo onboardAccessibility:false >> run/options.txt
- name: Build
working-directory: ./${{ inputs.dir }}
run: ./gradlew build --stracktrace
run: ./gradlew build --stacktrace
- name: Copy mod
run: cp ${{ inputs.dir }}/build/libs/mc-runtime-test-*-${{ inputs.type }}-release.jar run/mods
- name: LS mods dir
Expand Down
Loading