Skip to content

1.21 #11

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

Closed
wants to merge 4 commits into from
Closed

1.21 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 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
44c1b57
Updated to HeadlessMC 1.10.0
3arthqu4ke Jul 16, 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
12 changes: 6 additions & 6 deletions .github/actions/local-action/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,16 @@ runs:
run: echo hmc.assets.dummy=true >> HeadlessMC/config.properties
shell: bash
- name: Get HeadlessMC
run: wget -O headlessmc-launcher-1.9.5.jar https://github.com/3arthqu4ke/headlessmc/releases/download/1.9.5/headlessmc-launcher-1.9.5.jar
run: wget -O headlessmc-launcher-1.10.0.jar https://github.com/3arthqu4ke/headlessmc/releases/download/1.10.0/headlessmc-launcher-1.10.0.jar
shell: bash
- name: Download ${{ inputs.mc }}
run: java -jar headlessmc-launcher-1.9.5.jar --command download ${{ inputs.mc }}
run: java -jar headlessmc-launcher-1.10.0.jar --command download ${{ inputs.mc }}
shell: bash
- name: Download Fabric ${{ inputs.mc }}
run: java -jar headlessmc-launcher-1.9.5.jar --command ${{ inputs.modloader }} ${{ inputs.mc }} --java ${{ inputs.java }}
run: java -jar headlessmc-launcher-1.10.0.jar --command ${{ inputs.modloader }} ${{ inputs.mc }} --java ${{ inputs.java }}
shell: bash
- name: List versions
run: java -jar headlessmc-launcher-1.9.5.jar --command versions
run: java -jar headlessmc-launcher-1.10.0.jar --command versions
shell: bash
- name: Make mods dir
run: mkdir -p run/mods
Expand All @@ -120,8 +120,8 @@ runs:
uses: modmuss50/xvfb-action@v1
if: ${{ inputs.xvfb == 'true' }}
with:
run: java -jar headlessmc-launcher-1.9.5.jar --command launch ${{ inputs.regex }} -regex ${{ inputs.headlessmc-command }}
run: java -jar headlessmc-launcher-1.10.0.jar --command launch ${{ inputs.regex }} -regex ${{ inputs.headlessmc-command }}
- name: Run game
if: ${{ inputs.xvfb != 'true' }}
run: java -jar headlessmc-launcher-1.9.5.jar --command launch ${{ inputs.regex }} -regex ${{ inputs.headlessmc-command }}
run: java -jar headlessmc-launcher-1.10.0.jar --command launch ${{ inputs.regex }} -regex ${{ inputs.headlessmc-command }}
shell: bash
1 change: 1 addition & 0 deletions .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,7 @@ jobs:
matrix:
version:
- { dir: api, mc: api, lex: api, neo: api, java: 8 }
- { dir: 1_20, mc: 1.20.6, lex: 50.1.10, neo: 119, java: 17 }
- { 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
1 change: 1 addition & 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,7 @@ jobs:
matrix:
version:
- { dir: api, mc: api, lex: api, neo: api, java: 8 }
- { dir: 1_20, mc: 1.20.6, lex: 50.1.10, neo: 119, java: 17 }
- { 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
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 @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
version: [ {mc: 1.20.4, lex: 49.0.38, neo: 219}, {mc: 1.20.3, lex: 49.0.2, neo: 8-beta}, {mc: 1.20.2, lex: 48.1.0, neo: 88} ]
version: [ {mc: 1.20.6, lex: 50.1.10, neo: 119}, {mc: 1.20.4, lex: 49.0.38, neo: 219}, {mc: 1.20.3, lex: 49.0.2, neo: 8-beta}, {mc: 1.20.2, lex: 48.1.0, neo: 88} ]
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/fabric.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ jobs:
- name: Configure Dummy Assets
run: echo hmc.assets.dummy=true >> HeadlessMC/config.properties
- name: Get HeadlessMC
run: wget -O headlessmc-launcher-1.9.5.jar https://github.com/3arthqu4ke/headlessmc/releases/download/1.9.5/headlessmc-launcher-1.9.5.jar
run: wget -O headlessmc-launcher-1.10.0.jar https://github.com/3arthqu4ke/headlessmc/releases/download/1.10.0/headlessmc-launcher-1.10.0.jar
- name: Download 1.20.4
run: java -jar headlessmc-launcher-1.9.5.jar --command download 1.20.4
run: java -jar headlessmc-launcher-1.10.0.jar --command download 1.20.4
- name: Download Fabric 1.20.4
run: java -jar headlessmc-launcher-1.9.5.jar --command fabric 1.20.4
run: java -jar headlessmc-launcher-1.10.0.jar --command fabric 1.20.4
- name: List versions
run: java -jar headlessmc-launcher-1.9.5.jar --command versions
run: java -jar headlessmc-launcher-1.10.0.jar --command versions
- name: Make mods dir
run: mkdir -p run/mods
- name: Configure Accessibility
Expand All @@ -48,4 +48,4 @@ jobs:
- name: LS mods dir
run: ls run/mods
- name: Run game
run: java -jar headlessmc-launcher-1.9.5.jar --command launch fabric.*1.20.4 -regex -lwjgl --jvm -Djava.awt.headless=true
run: java -jar headlessmc-launcher-1.10.0.jar --command launch fabric.*1.20.4 -regex -lwjgl --jvm -Djava.awt.headless=true
18 changes: 9 additions & 9 deletions .github/workflows/run-gametests-latest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.0-fabric.jar run/mods
cp gametest-jars/clientgametest-1.20.6-2.0.0-neoforge.jar run/mods
cp gametest-jars/clientgametest-1.20.6-2.0.0-lexforge.jar run/mods
cp latest-jars/mc-runtime-test-1.20.6-2.0.0-fabric-release.jar run/mods
cp latest-jars/mc-runtime-test-1.20.6-2.0.0-lexforge-release.jar run/mods
cp latest-jars/mc-runtime-test-1.20.6-2.0.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, 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 }
uses: 3arthqu4ke/mc-runtime-test/.github/workflows/run-specific-reusable.yml@main
with:
dir: ${{ matrix.version.dir }}
Expand Down
3 changes: 3 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,9 @@ jobs:
strategy:
matrix:
version:
- { 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 }
- { 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
3 changes: 3 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,9 @@ jobs:
strategy:
matrix:
version:
- { 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 }
- { 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
12 changes: 6 additions & 6 deletions .github/workflows/run-specific-reusable.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,13 @@ jobs:
- name: Configure Dummy Assets
run: echo hmc.assets.dummy=true >> HeadlessMC/config.properties
- name: Get HeadlessMC
run: wget -O headlessmc-launcher-1.9.5.jar https://github.com/3arthqu4ke/headlessmc/releases/download/1.9.5/headlessmc-launcher-1.9.5.jar
run: wget -O headlessmc-launcher-1.10.0.jar https://github.com/3arthqu4ke/headlessmc/releases/download/1.10.0/headlessmc-launcher-1.10.0.jar
- name: Download ${{ inputs.mc }}
run: java -jar headlessmc-launcher-1.9.5.jar --command download ${{ inputs.mc }}
run: java -jar headlessmc-launcher-1.10.0.jar --command download ${{ inputs.mc }}
- name: Download ${{ inputs.modloader }} ${{ inputs.mc }}
run: java -jar headlessmc-launcher-1.9.5.jar --command ${{ inputs.modloader }} ${{ inputs.mc }} --java ${{ inputs.java }}
run: java -jar headlessmc-launcher-1.10.0.jar --command ${{ inputs.modloader }} ${{ inputs.mc }} --java ${{ inputs.java }}
- name: List versions
run: java -jar headlessmc-launcher-1.9.5.jar --command versions
run: java -jar headlessmc-launcher-1.10.0.jar --command versions
- name: Make mods dir
run: mkdir -p run/mods
- name: Configure Accessibility
Expand All @@ -97,8 +97,8 @@ jobs:
uses: modmuss50/xvfb-action@v1
if: ${{ inputs.xvfb == 'true' }}
with:
run: java -jar headlessmc-launcher-1.9.5.jar --command launch ${{ inputs.regex }} -regex ${{ inputs.headlessmc-command }}
run: java -jar headlessmc-launcher-1.10.0.jar --command launch ${{ inputs.regex }} -regex ${{ inputs.headlessmc-command }}
- name: Run game
if: ${{ inputs.xvfb != 'true' }}
run: java -jar headlessmc-launcher-1.9.5.jar --command launch ${{ inputs.regex }} -regex ${{ inputs.headlessmc-command }}
run: java -jar headlessmc-launcher-1.10.0.jar --command launch ${{ inputs.regex }} -regex ${{ inputs.headlessmc-command }}
shell: bash
12 changes: 6 additions & 6 deletions .github/workflows/run-specific.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,13 @@ jobs:
- name: Configure Dummy Assets
run: echo hmc.assets.dummy=true >> HeadlessMC/config.properties
- name: Get HeadlessMC
run: wget -O headlessmc-launcher-1.9.5.jar https://github.com/3arthqu4ke/headlessmc/releases/download/1.9.5/headlessmc-launcher-1.9.5.jar
run: wget -O headlessmc-launcher-1.10.0.jar https://github.com/3arthqu4ke/headlessmc/releases/download/1.10.0/headlessmc-launcher-1.10.0.jar
- name: Download ${{ github.event.inputs.mc }}
run: java -jar headlessmc-launcher-1.9.5.jar --command download ${{ github.event.inputs.mc }}
run: java -jar headlessmc-launcher-1.10.0.jar --command download ${{ github.event.inputs.mc }}
- name: Download ${{ github.event.inputs.modloader }} ${{ github.event.inputs.mc }}
run: java -jar headlessmc-launcher-1.9.5.jar --command ${{ github.event.inputs.modloader }} ${{ github.event.inputs.mc }} --java ${{ github.event.inputs.java }}
run: java -jar headlessmc-launcher-1.10.0.jar --command ${{ github.event.inputs.modloader }} ${{ github.event.inputs.mc }} --java ${{ github.event.inputs.java }}
- name: List versions
run: java -jar headlessmc-launcher-1.9.5.jar --command versions
run: java -jar headlessmc-launcher-1.10.0.jar --command versions
- name: Make mods dir
run: mkdir -p run/mods
- name: Configure Accessibility
Expand All @@ -90,9 +90,9 @@ jobs:
uses: modmuss50/xvfb-action@v1
if: ${{ github.event.inputs.xvfb == 'true' }}
with:
run: java -jar headlessmc-launcher-1.9.5.jar --command launch ${{ github.event.inputs.regex }} -regex ${{ github.event.inputs.headlessmc-command }}
run: java -jar headlessmc-launcher-1.10.0.jar --command launch ${{ github.event.inputs.regex }} -regex ${{ github.event.inputs.headlessmc-command }}
- name: Run game
if: ${{ github.event.inputs.xvfb != 'true' }}
run: java -jar headlessmc-launcher-1.9.5.jar --command launch ${{ github.event.inputs.regex }} -regex ${{ github.event.inputs.headlessmc-command }}
run: java -jar headlessmc-launcher-1.10.0.jar --command launch ${{ github.event.inputs.regex }} -regex ${{ github.event.inputs.headlessmc-command }}
shell: bash

2 changes: 1 addition & 1 deletion 1_20/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion 1_20/src/lexforge/resources/META-INF/mods.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ description = '''
[[dependencies.mc_runtime_test]]
modId = "minecraft"
mandatory = true
versionRange = "[1.20.2,1.20.4]"
versionRange = "[1.20.2,1.20.6]"
ordering = "NONE"
side = "BOTH"
2 changes: 1 addition & 1 deletion 1_20/src/neoforge/resources/META-INF/mods.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ description = '''
[[dependencies.mc_runtime_test]]
modId = "minecraft"
mandatory = true
versionRange = "[1.20.2,1.20.4]"
versionRange = "[1.20.2,1.20.6]"
ordering = "NONE"
side = "BOTH"
43 changes: 43 additions & 0 deletions 1_21/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# gradle

.gradle/
build/
out/
classes/

# eclipse

*.launch

# idea

.idea/
*.iml
*.ipr
*.iws

# vscode

.settings/
.vscode/
bin/
.classpath
.project

# macos

*.DS_Store

# fabric

run/

# java

hs_err_*.log
replay_*.log
*.hprof
*.jfr
/libs/
/logs/
/.architectury-transformer/
Loading
Loading