Skip to content
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

Launcher-Wrapper, InMemoryLauncher for almost all versions #172

Merged
merged 11 commits into from
Aug 4, 2024
Merged

Launcher-Wrapper, InMemoryLauncher for almost all versions #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8dbcba4
Added system property when running in memory, added jdk21 test workflow
3arthqu4ke Aug 1, 2024
970a55f
Improved JavaService
3arthqu4ke Aug 1, 2024
aed138f
Updated to gradle 8.9
3arthqu4ke Aug 1, 2024
da16fae
Launcher-Wrapper, Fixed InMemoryLauncher on most versions, compilatio…
3arthqu4ke Aug 4, 2024
ba19d14
Bumped version to 1.11
3arthqu4ke Aug 4, 2024
b718dd7
Fixed Jacoco Report
3arthqu4ke Aug 4, 2024
7cbc136
Added some tests
3arthqu4ke Aug 4, 2024
f207d16
Make codacy happy
3arthqu4ke Aug 4, 2024
337ee17
Switch to headlessmc-wrapper, make actions publish wrapper
3arthqu4ke Aug 4, 2024
9cf70c6
Fixed typo in workflows
3arthqu4ke Aug 4, 2024
713ecf4
Ignore 1.17.1 and 1.18.2 for InMemoryLaunching for now
3arthqu4ke Aug 4, 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
1 change: 0 additions & 1 deletion .github/workflows/docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,3 @@ jobs:
with:
push: true
tags: 3arthqu4ke/headlessmc:latest

47 changes: 47 additions & 0 deletions .github/workflows/jdk21-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: JDK-17-Tests

on:
push:
pull_request:
types: [opened, reopened]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: '21'
distribution: 'adopt'

- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Build with Gradle
run: |
./gradlew build

- name: List files
run: ls

- name: Publish jars
uses: actions/upload-artifact@v3
with:
name: HeadlessMc
path: ./build/libs/headlessmc-*.jar

- name: Publish shell script
uses: actions/upload-artifact@v3
with:
name: HeadlessMc
path: ./headlessmc-scripts/hmc

- name: Publish bat script
uses: actions/upload-artifact@v3
with:
name: HeadlessMc
path: ./headlessmc-scripts/hmc.bat
8 changes: 8 additions & 0 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@ jobs:
- name: Delete launcher sources jar
run: rm headlessmc-launcher/build/libs/headlessmc-launcher-*-sources.jar

- name: Delete launcher-wrapper dev jar
run: rm headlessmc-launcher-wrapper/build/libs/headlessmc-launcher-*-dev.jar
- name: Delete launcher-wrapper javadoc jar
run: rm headlessmc-launcher-wrapper/build/libs/headlessmc-launcher-*-javadoc.jar
- name: Delete launcher-wrapper sources jar
run: rm headlessmc-launcher-wrapper/build/libs/headlessmc-launcher-*-sources.jar

- name: Delete lwjgl dev jar
run: rm headlessmc-lwjgl/build/libs/headlessmc-lwjgl-*-dev.jar
- name: Delete lwjgl javadoc jar
Expand All @@ -46,6 +53,7 @@ jobs:
with:
generate_release_notes: true
files: |
./headlessmc-launcher-wrapper/build/libs/headlessmc-launcher-*.jar
./headlessmc-launcher/build/libs/headlessmc-launcher-*.jar
./headlessmc-lwjgl/build/libs/headlessmc-lwjgl-*.jar
./headlessmc-launcher-jfx/build/libs/headlessmc-launcher-jfx-*.jar
Expand Down
21 changes: 12 additions & 9 deletions .github/workflows/run-matrix-in-memory.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,19 @@ jobs:
run: chmod +x gradlew
- name: Build
run: ./gradlew build

- name: Delete dev jar
run: rm headlessmc-launcher/build/libs/headlessmc-launcher-*-dev.jar
run: rm headlessmc-launcher-wrapper/build/libs/headlessmc-launcher-*-dev.jar
- name: Delete javadoc jar
run: rm headlessmc-launcher/build/libs/headlessmc-launcher-*-javadoc.jar
run: rm headlessmc-launcher-wrapper/build/libs/headlessmc-launcher-*-javadoc.jar
- name: Delete sources jar
run: rm headlessmc-launcher/build/libs/headlessmc-launcher-*-sources.jar
run: rm headlessmc-launcher-wrapper/build/libs/headlessmc-launcher-*-sources.jar

- name: Rename launcher jar
run: mv headlessmc-launcher/build/libs/headlessmc-launcher-*.jar headlessmc-launcher/build/libs/headlessmc-launcher.jar
run: mv headlessmc-launcher-wrapper/build/libs/headlessmc-launcher-*.jar headlessmc-launcher-wrapper/build/libs/headlessmc-launcher.jar
- name: Copy launcher jar
run: cp headlessmc-launcher/build/libs/headlessmc-launcher.jar .
run: cp headlessmc-launcher-wrapper/build/libs/headlessmc-launcher.jar .

- name: Upload Launcher Jar
uses: actions/upload-artifact@v4
with:
Expand Down Expand Up @@ -70,10 +73,10 @@ jobs:
- { mc: 1.19.1, type: lexforge, modloader: forge, regex: .*forge.*, java: 17 }
- { mc: 1.19, type: fabric, modloader: fabric, regex: .*fabric.*, java: 17 }
- { mc: 1.19, type: lexforge, modloader: forge, regex: .*forge.*, java: 17 }
- { mc: 1.18.2, type: fabric, modloader: fabric, regex: .*fabric.*, java: 17 }
- { mc: 1.18.2, type: lexforge, modloader: forge, regex: .*forge.*, java: 17 }
- { mc: 1.17.1, type: fabric, modloader: fabric, regex: .*fabric.*, java: 16 }
- { mc: 1.17.1, type: lexforge, modloader: forge, regex: .*forge.*, java: 16 }
#- { mc: 1.18.2, type: fabric, modloader: fabric, regex: .*fabric.*, java: 17 }
#- { mc: 1.18.2, type: lexforge, modloader: forge, regex: .*forge.*, java: 17 }
#- { mc: 1.17.1, type: fabric, modloader: fabric, regex: .*fabric.*, java: 16 }
#- { mc: 1.17.1, type: lexforge, modloader: forge, regex: .*forge.*, java: 16 }
- { mc: 1.16.5, type: fabric, modloader: fabric, regex: .*fabric.*, java: 8 }
- { mc: 1.16.5, type: lexforge, modloader: forge, regex: .*forge.*, java: 8 }
- { mc: 1.12.2, type: lexforge, modloader: forge, regex: .*forge.*, java: 8 }
Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/run-matrix-xvfb.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,19 @@ jobs:
run: chmod +x gradlew
- name: Build
run: ./gradlew build

- name: Delete dev jar
run: rm headlessmc-launcher/build/libs/headlessmc-launcher-*-dev.jar
run: rm headlessmc-launcher-wrapper/build/libs/headlessmc-launcher-*-dev.jar
- name: Delete javadoc jar
run: rm headlessmc-launcher/build/libs/headlessmc-launcher-*-javadoc.jar
run: rm headlessmc-launcher-wrapper/build/libs/headlessmc-launcher-*-javadoc.jar
- name: Delete sources jar
run: rm headlessmc-launcher/build/libs/headlessmc-launcher-*-sources.jar
run: rm headlessmc-launcher-wrapper/build/libs/headlessmc-launcher-*-sources.jar

- name: Rename launcher jar
run: mv headlessmc-launcher/build/libs/headlessmc-launcher-*.jar headlessmc-launcher/build/libs/headlessmc-launcher.jar
run: mv headlessmc-launcher-wrapper/build/libs/headlessmc-launcher-*.jar headlessmc-launcher-wrapper/build/libs/headlessmc-launcher.jar
- name: Copy launcher jar
run: cp headlessmc-launcher/build/libs/headlessmc-launcher.jar .
run: cp headlessmc-launcher-wrapper/build/libs/headlessmc-launcher.jar .

- name: Upload Launcher Jar
uses: actions/upload-artifact@v4
with:
Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/run-matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,19 @@ jobs:
run: chmod +x gradlew
- name: Build
run: ./gradlew build

- name: Delete dev jar
run: rm headlessmc-launcher/build/libs/headlessmc-launcher-*-dev.jar
run: rm headlessmc-launcher-wrapper/build/libs/headlessmc-launcher-*-dev.jar
- name: Delete javadoc jar
run: rm headlessmc-launcher/build/libs/headlessmc-launcher-*-javadoc.jar
run: rm headlessmc-launcher-wrapper/build/libs/headlessmc-launcher-*-javadoc.jar
- name: Delete sources jar
run: rm headlessmc-launcher/build/libs/headlessmc-launcher-*-sources.jar
run: rm headlessmc-launcher-wrapper/build/libs/headlessmc-launcher-*-sources.jar

- name: Rename launcher jar
run: mv headlessmc-launcher/build/libs/headlessmc-launcher-*.jar headlessmc-launcher/build/libs/headlessmc-launcher.jar
run: mv headlessmc-launcher-wrapper/build/libs/headlessmc-launcher-*.jar headlessmc-launcher-wrapper/build/libs/headlessmc-launcher.jar
- name: Copy launcher jar
run: cp headlessmc-launcher/build/libs/headlessmc-launcher.jar .
run: cp headlessmc-launcher-wrapper/build/libs/headlessmc-launcher.jar .

- name: Upload Launcher Jar
uses: actions/upload-artifact@v4
with:
Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/run-specific-all-modloaders.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,19 @@ jobs:
run: chmod +x gradlew
- name: Build
run: ./gradlew build

- name: Delete dev jar
run: rm headlessmc-launcher/build/libs/headlessmc-launcher-*-dev.jar
run: rm headlessmc-launcher-wrapper/build/libs/headlessmc-launcher-*-dev.jar
- name: Delete javadoc jar
run: rm headlessmc-launcher/build/libs/headlessmc-launcher-*-javadoc.jar
run: rm headlessmc-launcher-wrapper/build/libs/headlessmc-launcher-*-javadoc.jar
- name: Delete sources jar
run: rm headlessmc-launcher/build/libs/headlessmc-launcher-*-sources.jar
run: rm headlessmc-launcher-wrapper/build/libs/headlessmc-launcher-*-sources.jar

- name: Rename launcher jar
run: mv headlessmc-launcher/build/libs/headlessmc-launcher-*.jar headlessmc-launcher/build/libs/headlessmc-launcher.jar
run: mv headlessmc-launcher-wrapper/build/libs/headlessmc-launcher-*.jar headlessmc-launcher-wrapper/build/libs/headlessmc-launcher.jar
- name: Copy launcher jar
run: cp headlessmc-launcher/build/libs/headlessmc-launcher.jar .
run: cp headlessmc-launcher-wrapper/build/libs/headlessmc-launcher.jar .

- name: Upload Launcher Jar
uses: actions/upload-artifact@v4
with:
Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/run-specific.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,19 @@ jobs:
run: chmod +x gradlew
- name: Build
run: ./gradlew build

- name: Delete dev jar
run: rm headlessmc-launcher/build/libs/headlessmc-launcher-*-dev.jar
run: rm headlessmc-launcher-wrapper/build/libs/headlessmc-launcher-*-dev.jar
- name: Delete javadoc jar
run: rm headlessmc-launcher/build/libs/headlessmc-launcher-*-javadoc.jar
run: rm headlessmc-launcher-wrapper/build/libs/headlessmc-launcher-*-javadoc.jar
- name: Delete sources jar
run: rm headlessmc-launcher/build/libs/headlessmc-launcher-*-sources.jar
run: rm headlessmc-launcher-wrapper/build/libs/headlessmc-launcher-*-sources.jar

- name: Rename launcher jar
run: mv headlessmc-launcher/build/libs/headlessmc-launcher-*.jar headlessmc-launcher/build/libs/headlessmc-launcher.jar
run: mv headlessmc-launcher-wrapper/build/libs/headlessmc-launcher-*.jar headlessmc-launcher-wrapper/build/libs/headlessmc-launcher.jar
- name: Copy launcher jar
run: cp headlessmc-launcher/build/libs/headlessmc-launcher.jar .
run: cp headlessmc-launcher-wrapper/build/libs/headlessmc-launcher.jar .

- name: Run the MC client
uses: 3arthqu4ke/mc-runtime-test@2.1.0
with:
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,7 @@ run
/headlessmc-lwjgl/logs/
/logs/
/headlessmc-launcher-*.jar
/libs/
/headlessmc-launcher/libs/
/fabricloader.log
/.mixin.out/
Loading
Loading