Merge pull request #172 from 3arthqu4ke/1.11

Launcher-Wrapper, InMemoryLauncher for almost all versions
3arthqu4ke · Aug 4, 2024 · 957c2f7 · 957c2f7
2 parents 04e0d5c + 713ecf4
commit 957c2f7
Show file tree

Hide file tree

Showing 97 changed files with 1,725 additions and 325 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -30,4 +30,3 @@ jobs:
         with:
           push: true
           tags: 3arthqu4ke/headlessmc:latest
-
diff --git a/.github/workflows/jdk21-tests.yml b/.github/workflows/jdk21-tests.yml
@@ -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
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -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
@@ -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

diff --git a/.github/workflows/run-matrix-in-memory.yml b/.github/workflows/run-matrix-in-memory.yml
@@ -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:
@@ -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 }

diff --git a/.github/workflows/run-matrix-xvfb.yml b/.github/workflows/run-matrix-xvfb.yml
@@ -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:

diff --git a/.github/workflows/run-matrix.yml b/.github/workflows/run-matrix.yml
@@ -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:

diff --git a/.github/workflows/run-specific-all-modloaders.yml b/.github/workflows/run-specific-all-modloaders.yml
@@ -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:

diff --git a/.github/workflows/run-specific.yml b/.github/workflows/run-specific.yml
@@ -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:

diff --git a/.gitignore b/.gitignore
@@ -34,3 +34,7 @@ run
 /headlessmc-lwjgl/logs/
 /logs/
 /headlessmc-launcher-*.jar
+/libs/
+/headlessmc-launcher/libs/
+/fabricloader.log
+/.mixin.out/
Original file line number	Diff line number	Diff line change
Expand Up		@@ -30,4 +30,3 @@ jobs:
		with:
		push: true
		tags: 3arthqu4ke/headlessmc:latest