From 73ce879155deb2b101be5c288bcf3269a02cf0df Mon Sep 17 00:00:00 2001
From: 3arthqu4ke <56741599+3arthqu4ke@users.noreply.github.com>
Date: Thu, 15 May 2025 20:57:30 +1000
Subject: [PATCH 1/2] Automatic-Module-Names in Manifest and META-INF/versions
 module-info for hmc-lwjgl

---
 build.gradle                  | 14 ++++++++++++++
 headlessmc-lwjgl/build.gradle |  9 ++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 97762922..0f251dcf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -152,6 +152,20 @@ allprojects {
 
     jar {
         archiveClassifier.set('dev')
+        manifest {
+            attributes(
+                "Implementation-Title": project.name,
+                "Implementation-Version": version,
+            )
+        }
+
+        if (project != project(':headlessmc-lwjgl')) {
+            manifest {
+                attributes(
+                    "Automatic-Module-Name": "io.github.headlesshq.${project.name.replace("launcher-", "").replace('-', '.')}"
+                )
+            }
+        }
     }
 
     shadowJar {
diff --git a/headlessmc-lwjgl/build.gradle b/headlessmc-lwjgl/build.gradle
index 3b2d1a5a..da33a795 100644
--- a/headlessmc-lwjgl/build.gradle
+++ b/headlessmc-lwjgl/build.gradle
@@ -9,13 +9,15 @@ repositories {
 }
 
 module {
-    name = 'headlessmc.lwjgl'
+    name = 'io.github.headlesshq.headlessmc.lwjgl'
     access = ACC_OPEN
+    directory = project.layout.buildDirectory.dir('resources/main/META-INF/versions/9')
 
     exports 'io/github/headlesshq/headlessmc/lwjgl'
     exports 'io/github/headlesshq/headlessmc/lwjgl/api'
     exports 'io/github/headlesshq/headlessmc/lwjgl/transformer'
     exports 'io/github/headlesshq/headlessmc/lwjgl/redirections'
+    exports 'io/github/headlesshq/headlessmc/lwjgl/redirections/stb'
     exports 'io/github/headlesshq/headlessmc/lwjgl/util'
     exports 'io/github/headlesshq/headlessmc/lwjgl/agent'
 
@@ -65,6 +67,11 @@ jar {
     }
 }
 
+shadowJar {
+    include("META-INF/versions/9/module-info.class")
+    exclude("module-info.class") // exclude asm module-info.class
+}
+
 // https://github.com/3arthqu4ke/headlessmc/issues/199
 // fabric 0.16.2+ doesn't like multiple asm versions in the classpath
 tasks.register('noAsmJar', Copy) {

From e186f55d0b5034a8a1c3773f53892d048a898239 Mon Sep 17 00:00:00 2001
From: 3arthqu4ke <56741599+3arthqu4ke@users.noreply.github.com>
Date: Thu, 15 May 2025 21:00:55 +1000
Subject: [PATCH 2/2] Fixed CI for CheerpJ web page

---
 .github/workflows/lifecycle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lifecycle.yml b/.github/workflows/lifecycle.yml
index ce21a7b8..4770f873 100644
--- a/.github/workflows/lifecycle.yml
+++ b/.github/workflows/lifecycle.yml
@@ -164,7 +164,7 @@ jobs:
         run: mv headlessmc-web/build/libs/headlessmc-web-*.jar headlessmc-web/build/libs/headlessmc-web.jar
       - name: Copy Web jar
         if: github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/main')
-        run: cp headlessmc-web/build/libs/headlessmc-web.jar _site/cheerpj/
+        run: cp headlessmc-web/build/libs/headlessmc-web.jar _site/cheerpj
       - name: Copy web page files
         if: github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/main')
         run: cp -a headlessmc-web/page/. _site/cheerpj/