Fix CICD

Author: tier940

.github/workflows/preview.yml

@@ -55,7 +55,7 @@ jobs:
       - name: Set Modpack Version
         run: |
           if [[ "${{ matrix.buildType }}" == "lwjgl3" ]]; then
-            VER="${{ env.VERSION_LWJGL3 }}"
+            VER="${{ env.JAVA_OPT }}"
             echo "[CleanroomMMC] GregTech Expert 2 $VER" > overrides/config/txloader/load/custommainmenu/version.txt
           else
             VER="${{ env.JAVA8_CF }}"

.github/workflows/release.yml

@@ -52,7 +52,7 @@ jobs:
       - name: Set Modpack Version
         run: |
           if [[ "${{ matrix.buildType }}" == "lwjgl3" ]]; then
-            VER="${{ env.VERSION_LWJGL3 }}"
+            VER="${{ env.JAVA_OPT }}"
             echo "[CleanroomMMC] GregTech Expert 2 $VER" > overrides/config/txloader/load/custommainmenu/version.txt
           else
             VER="${{ env.JAVA8_CF }}"

buildtools/gen-lwjgl3-manifest.py

@@ -1,28 +1,47 @@
 #!/usr/bin/env python3
-# Remove lwjgl3 not supported mods
+# Generate LWJGL3 compatible manifest.json
 
-## Import library
 import json
+import json5
 
 
-## Run main function
-projectIDs = [
-    419286, # MixinBooter
-    870276, # ConfigAnytime
-    873867, # Red Core
-    910715, # Alfheim Lighting Engine
-    624967, # RenderLib
-    409087, # Entity Culling
-    408853, # Particle Culling
-]
+def main():
+    # Read overrides configuration
+    with open('lwjgl3-overrides.jsonc', 'r', encoding='utf-8') as f:
+        overrides = json5.load(f)
 
-# Read manifest.json
-with open('../manifest.json', 'r') as f:
-    data = json.load(f)
+    remove_ids = set(overrides.get('remove', []))
+    add_mods = overrides.get('add', [])
+    replace_mods = {mod['projectID']: mod['with'] for mod in overrides.get('replace', [])}
 
-# Remove lwjgl3 not supported mods
-data['files'] = [item for item in data['files'] if item['projectID'] not in projectIDs]
+    # Read manifest.json
+    with open('../manifest.json', 'r', encoding='utf-8') as f:
+        data = json.load(f)
 
-# Write manifest.json
-with open('../cmmc/manifest.json', 'w') as f:
-    json.dump(data, f, indent=2)
+    # Remove mods
+    data['files'] = [item for item in data['files'] if item['projectID'] not in remove_ids]
+
+    # Replace mods (update projectID and/or fileID)
+    for item in data['files']:
+        if item['projectID'] in replace_mods:
+            replacement = replace_mods[item['projectID']]
+            item['projectID'] = replacement['projectID']
+            item['fileID'] = replacement['fileID']
+            if 'required' in replacement:
+                item['required'] = replacement['required']
+
+    # Add mods
+    for mod in add_mods:
+        data['files'].append({
+            'projectID': mod['projectID'],
+            'fileID': mod['fileID'],
+            'required': mod.get('required', True)
+        })
+
+    # Write manifest.json
+    with open('../cmmc/manifest.json', 'w', encoding='utf-8') as f:
+        json.dump(data, f, indent=2)
+
+
+if __name__ == '__main__':
+    main()

buildtools/lwjgl3-overrides.jsonc

@@ -0,0 +1,44 @@
+{
+  // Mods to remove for LWJGL3 build (projectID)
+  "remove": [
+    419286, // MixinBooter
+    870276, // ConfigAnytime
+    873867, // Red Core
+    910715, // Alfheim Lighting Engine
+    624967, // RenderLib
+    409087, // Entity Culling
+    408853  // Particle Culling
+  ],
+
+  // Mods to add for LWJGL3 build
+  "add": [
+    { // Fugue
+      "projectID": 1005815,
+      "fileID": 7355882,
+      "required": true
+    }, 
+    { // Scalar Legacy
+      "projectID": 1235372,
+      "fileID": 6842491,
+      "required": true
+    }
+  ],
+
+  // Mods to replace with LWJGL3 compatible versions
+  "replace": [
+    { // CodeChicken Lib -> CodeChicken Lib CRE
+      "projectID": 242818,
+      "with": {
+        "projectID": 1328922,
+        "fileID": 6898525
+      }
+    },
+    { // ModernSplash -> ModernSplash LWJGL3 version
+      "projectID": 629058,
+      "with": {
+        "projectID": 629058,
+        "fileID": 6501489
+      }
+    }
+  ]
+}

buildtools/pyproject.toml

@@ -1,9 +1,10 @@
 [project]
 name = "gte2-buildtools"
-version = "1.0.0"
+version = "1.1.0"
 description = "Build tools for GTE2 Modpack"
-requires-python = ">=3.12"
+requires-python = ">=3.14"
 dependencies = [
+    "json5>=0.12.1",
     "requests>=2.32.5",
 ]