Skip to content

1.21.4 support and fix build #5

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
3arthqu4ke merged 9 commits into from
Jan 21, 2025
Merged

1.21.4 support and fix build #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1a3eced
1.21.4 support, fixed builds
3arthqu4ke Jan 21, 2025
8707938
Updated mc-runtime-test
3arthqu4ke Jan 21, 2025
da1e117
Do not use the gradle-task for github actions
3arthqu4ke Jan 21, 2025
966ab47
Fix mc-runtime-test workflow
3arthqu4ke Jan 21, 2025
aa3cad2
Fixed mc-runtime-test workflow
3arthqu4ke Jan 21, 2025
6231b1d
Fixed Window Mixin for 1.21
3arthqu4ke Jan 21, 2025
4f4a429
Fix MixinWindow for Mc 1.21.1-4
3arthqu4ke Jan 21, 2025
be7188f
Run mc-runtime-test action with the correct jars
3arthqu4ke Jan 21, 2025
7fe30d6
Fixed fabric runs in mc-runtime-test action
3arthqu4ke Jan 21, 2025
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
1 change: 1 addition & 0 deletions .github/workflows/build-all.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ jobs:
strategy:
matrix:
version:
- { dir: 1_21, mc: 1.21.4, lex: 54.0.17, neo: 70-beta, java: 21 }
- { dir: 1_21, mc: 1.21.3, lex: 53.0.7, neo: 11-beta, java: 21 }
- { dir: 1_21, mc: 1.21.1, lex: 52.0.2, neo: 4, java: 21 }
#- { dir: 1_21, mc: 1.21, lex: 51.0.24, neo: 96-beta, java: 21 }
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/run-matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@ name: Run with gradle
on:
workflow_dispatch:
workflow_call:
push:
pull_request:

jobs:
run:
strategy:
matrix:
version:
- { dir: 1_21, mc: 1.21.4, java: 21, lex: 54.0.17, neo: 70-beta, task: neoforgeRunWithHeadlessMc }
- { dir: 1_21, mc: 1.21.4, java: 21, lex: 54.0.17, neo: 70-beta, task: forgeRunWithHeadlessMc }
- { dir: 1_21, mc: 1.21.4, java: 21, lex: 54.0.17, neo: 70-beta, task: fabricRunWithHeadlessMc }
- { dir: 1_21, mc: 1.21.3, java: 21, lex: 53.0.7, neo: 11-beta, task: neoforgeRunWithHeadlessMc }
- { dir: 1_21, mc: 1.21.3, java: 21, lex: 53.0.7, neo: 11-beta, task: forgeRunWithHeadlessMc }
- { dir: 1_21, mc: 1.21.3, java: 21, lex: 53.0.7, neo: 11-beta, task: fabricRunWithHeadlessMc }
Expand Down
47 changes: 26 additions & 21 deletions .github/workflows/run-mc-runtime-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,34 @@ name: Run all versions with mc-runtime-test
on:
workflow_dispatch:
workflow_call:
push:
pull_request:

jobs:
run:
strategy:
matrix:
version:
- { dir: 1_21, mc: 1.21.3, type: lexforge, modloader: forge, regex: .*forge.*, java: 21 }
- { dir: 1_21, mc: 1.21.3, type: neoforge, modloader: neoforge, regex: .*neoforge.*, java: 21 }
- { dir: 1_21, mc: 1.21.3, type: fabric, modloader: fabric, regex: .*fabric.*, java: 21 }
- { dir: 1_21, mc: 1.21.1, type: lexforge, modloader: forge, regex: .*forge.*, java: 21 }
- { dir: 1_21, mc: 1.21.1, type: neoforge, modloader: neoforge, regex: .*neoforge.*, java: 21 }
- { dir: 1_21, mc: 1.21.1, type: fabric, modloader: fabric, regex: .*fabric.*, java: 21 }
#- { dir: 1_21, mc: 1.21, type: lexforge, modloader: lexforge, 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, mc: 1.20.6, type: lexforge, modloader: lexforge, 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_19, mc: 1.19.4, type: lexforge, modloader: lexforge, regex: .*forge.*, java: 17 }
- { dir: 1_19, mc: 1.19.4, type: fabric, modloader: fabric, regex: .*fabric.*, java: 17 }
- { dir: 1_16, mc: 1.16.5, type: lexforge, modloader: lexforge, regex: .*forge.*, java: 8 }
- { dir: 1_16, mc: 1.16.5, type: fabric, modloader: fabric, regex: .*fabric.*, java: 8 }
- { dir: 1_12, mc: 1.12.2, type: lexforge, modloader: lexforge, regex: .*forge.*, java: 8 }
- { dir: 1_21, mc: 1.21.4, java: 21, lex: 54.0.17, neo: 70-beta, type: neoforge, modloader: neoforge, regex: .*neoforge.* }
- { dir: 1_21, mc: 1.21.4, java: 21, lex: 54.0.17, neo: 70-beta, type: lexforge, modloader: forge, regex: .*forge.* }
- { dir: 1_21, mc: 1.21.4, java: 21, lex: 54.0.17, neo: 70-beta, type: fabric, modloader: fabric, regex: .*fabric.* }
- { dir: 1_21, mc: 1.21.3, java: 21, lex: 53.0.7, neo: 11-beta, type: neoforge, modloader: neoforge, regex: .*neoforge.* }
- { dir: 1_21, mc: 1.21.3, java: 21, lex: 53.0.7, neo: 11-beta, type: lexforge, modloader: forge, regex: .*forge.* }
- { dir: 1_21, mc: 1.21.3, java: 21, lex: 53.0.7, neo: 11-beta, type: fabric, modloader: fabric, regex: .*fabric.* }
- { dir: 1_21, mc: 1.21.1, java: 21, lex: 52.0.2, neo: 4, type: neoforge, modloader: neoforge, regex: .*neoforge.* }
- { dir: 1_21, mc: 1.21.1, java: 21, lex: 52.0.2, neo: 4, type: lexforge, modloader: forge, regex: .*forge.* }
- { dir: 1_21, mc: 1.21.1, java: 21, lex: 52.0.2, neo: 4, type: fabric, modloader: fabric, regex: .*fabric.* }
#- { dir: 1_21, mc: 1.21, java: 21, lex: 51.0.24, neo: 96-beta, type: neoforge, modloader: neoforge, regex: .*neoforge.* }
#- { dir: 1_21, mc: 1.21, java: 21, lex: 51.0.24, neo: 96-beta, type: lexforge, modloader: forge, regex: .*forge.* }
#- { dir: 1_21, mc: 1.21, java: 21, lex: 51.0.24, neo: 96-beta, fabric, modloader: fabric, regex: .*fabric.* }
- { dir: 1_20, mc: 1.20.6, java: 21, lex: 50.1.10, neo: 119, type: neoforge, modloader: neoforge, regex: .*neoforge.* }
- { dir: 1_20, mc: 1.20.6, java: 21, lex: 50.1.10, neo: 119, type: lexforge, modloader: forge, regex: .*forge.* }
- { dir: 1_20, mc: 1.20.6, java: 21, lex: 50.1.10, neo: 119, type: fabric, modloader: fabric, regex: .*fabric.* }
- { dir: 1_19, mc: 1.19.4, java: 17, lex: 45.2.9, neo: 0, type: lexforge, modloader: forge, regex: .*forge.* }
- { dir: 1_19, mc: 1.19.4, java: 17, lex: 45.2.9, neo: 0, type: fabric, modloader: fabric, regex: .*fabric.* }
- { dir: 1_16, mc: 1.16.5, java: 8, lex: 36.2.42, neo: 0, type: lexforge, modloader: forge, regex: .*forge.* }
- { dir: 1_16, mc: 1.16.5, java: 8, lex: 36.2.42, neo: 0, type: fabric, modloader: fabric, regex: .*fabric.* }
- { dir: 1_12, mc: 1.12.2, java: 8, lex: 14.23.5.2860, neo: 0, type: lexforge, modloader: forge, regex: .*forge.* }
runs-on: ubuntu-latest
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
steps:
Expand All @@ -42,21 +47,21 @@ jobs:
run: chmod +x gradlew
- name: Build with Gradle
working-directory: ./${{ matrix.version.dir }}
run: ./gradlew build --stacktrace
run: ./gradlew build -Pminecraft_version=${{ matrix.version.mc }} -Plexforge_version=${{ matrix.version.lex }} -Pneoforge_version=${{ matrix.version.neo }} --stacktrace
- name: Create mods dir
run: mkdir -p run/mods
- name: List mod files
run: ls ${{ matrix.version.dir }}/build/libs
- name: Delete dev jar
run: rm ${{ matrix.version.dir }}/build/libs/*-dev.jar
- name: Delete remapped jar
run: rm ${{ matrix.version.dir }}/build/libs/*-remapped.jar
#- name: Delete remapped jar
# run: rm ${{ matrix.version.dir }}/build/libs/*-remapped.jar
- name: Copy mod jar
run: cp ${{ matrix.version.dir }}/build/libs/hmc-optimizations-*${{ matrix.version.type }}*.jar run/mods
- name: List mod dir
run: ls run/mods
- name: Run the MC client
uses: 3arthqu4ke/mc-runtime-test@2.4.0
uses: 3arthqu4ke/mc-runtime-test@3.0.0
with:
mc: ${{ matrix.version.mc }}
modloader: ${{ matrix.version.modloader }}
Expand Down
10 changes: 1 addition & 9 deletions 1_12/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ buildscript {

plugins {
id 'java'
id 'xyz.wagyourtail.unimined' version '1.3.10-SNAPSHOT'
id 'xyz.wagyourtail.unimined' version '1.3.10'
id 'com.gradleup.shadow' version '8.3.0'
id 'io.github.headlesshq.headlessmc-gradle-plugin' version '0.3.0'
}
Expand Down Expand Up @@ -259,11 +259,3 @@ for (Modlauncher mLauncher : Modlauncher.values()) {
}
}
}

remapFabricSourcesJar {
enabled = false
}

remapLexforgeSourcesJar {
enabled = false
}
2 changes: 1 addition & 1 deletion 1_16/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ buildscript {

plugins {
id 'java'
id 'xyz.wagyourtail.unimined' version '1.3.9'
id 'xyz.wagyourtail.unimined' version '1.3.10'
id 'io.github.headlesshq.headlessmc-gradle-plugin' version '0.3.0'
}

Expand Down
2 changes: 1 addition & 1 deletion 1_19/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ buildscript {

plugins {
id 'java'
id 'xyz.wagyourtail.unimined' version '1.3.9'
id 'xyz.wagyourtail.unimined' version '1.3.10'
id 'io.github.headlesshq.headlessmc-gradle-plugin' version '0.3.0'
}

Expand Down
2 changes: 1 addition & 1 deletion 1_20/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ buildscript {

plugins {
id 'java'
id 'xyz.wagyourtail.unimined' version '1.3.9'
id 'xyz.wagyourtail.unimined' version '1.3.10'
id 'io.github.headlesshq.headlessmc-gradle-plugin' version '0.3.0'
}

Expand Down
2 changes: 1 addition & 1 deletion 1_21/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ buildscript {

plugins {
id 'java'
id 'xyz.wagyourtail.unimined' version '1.3.9'
id 'xyz.wagyourtail.unimined' version '1.3.10'
id 'io.github.headlesshq.headlessmc-gradle-plugin' version '0.3.0'
}

Expand Down
6 changes: 3 additions & 3 deletions 1_21/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
org.gradle.jvmargs = -Xmx2G

minecraft_version = 1.21.1
minecraft_version = 1.21.4
mapping_version = 1
neoforge_version = 22
lexforge_version = 52.0.4
neoforge_version = 70-beta
lexforge_version = 54.0.17
fabric_version = 0.14.24
# Whether to use the headlessmc lwjgl agent or not
hmc.lwjgl=true
Expand Down
Loading