From 256b35cdac9e204e603a3903328e20a28d8d4cbb Mon Sep 17 00:00:00 2001 From: Donjuanplatinum Date: Sun, 14 Jun 2026 13:11:23 +0800 Subject: [PATCH 01/11] fix the github action: adding CTNH-Astral for CTNH-Core --- settings.gradle | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 1215bbf..4fa0ecb 100644 --- a/settings.gradle +++ b/settings.gradle @@ -46,4 +46,7 @@ include "modules:CTNH-Lib" include "modules:CTNH-Mana" include "modules:CTNH-Energy" include "modules:GregTech-Modern" -include "modules:CTNH-Astral" +def astralDir = file("modules/CTNH-Astral") +if (astralDir.exists() && astralDir.listFiles()?.length > 0) { + include "modules:CTNH-Astral" +} From 11861d2944aea84c2a8d3a9712a21cc3b9e4e4f7 Mon Sep 17 00:00:00 2001 From: Donjuanplatinum Date: Sun, 14 Jun 2026 13:24:13 +0800 Subject: [PATCH 02/11] fix the github action: adding CTNH-Astral for CTNH-Core --- .../actions/ctnh_prepare_workspace/action.yml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/.github/actions/ctnh_prepare_workspace/action.yml b/.github/actions/ctnh_prepare_workspace/action.yml index 7d94d98..85f56e4 100644 --- a/.github/actions/ctnh_prepare_workspace/action.yml +++ b/.github/actions/ctnh_prepare_workspace/action.yml @@ -27,15 +27,6 @@ inputs: required: false default: dev - ctnh_astral_repository: - description: CTNH-Astral repository. - required: false - default: CTNH-Team/CTNH-Astral - ctnh_astral_ref: - description: CTNH-Astral ref. - required: false - default: dev - ctnh_bio_repository: description: CTNH-Bio repository. required: false @@ -109,15 +100,6 @@ runs: ref: ${{ inputs.ctnh_core_ref }} path: CTNH-Modules/modules/CTNH-Core - - name: Checkout CTNH-Astral - if: ${{ inputs.module_name != 'CTNH-Astral' }} - uses: actions/checkout@v4 - with: - token: ${{ inputs.token }} - repository: ${{ inputs.ctnh_astral_repository }} - ref: ${{ inputs.ctnh_astral_ref }} - path: CTNH-Modules/modules/CTNH-Astral - - name: Checkout CTNH-Bio if: ${{ inputs.module_name != 'CTNH-Bio' }} uses: actions/checkout@v4 From 3ecd0eb664538d97ce7cd2ac961749f9e37a11df Mon Sep 17 00:00:00 2001 From: Donjuanplatinum Date: Sun, 14 Jun 2026 13:40:47 +0800 Subject: [PATCH 03/11] ci(jdk_version): pin the version of jdk --- .github/actions/ctnh_prepare_workspace/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/ctnh_prepare_workspace/action.yml b/.github/actions/ctnh_prepare_workspace/action.yml index 85f56e4..4b840b6 100644 --- a/.github/actions/ctnh_prepare_workspace/action.yml +++ b/.github/actions/ctnh_prepare_workspace/action.yml @@ -158,7 +158,7 @@ runs: uses: actions/setup-java@v4 with: distribution: temurin - java-version: '17' + java-version: '17.0.10' - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 From 6d871fc8844c9ea76104135dcdc7e30ff1dd67f4 Mon Sep 17 00:00:00 2001 From: Donjuanplatinum Date: Sun, 14 Jun 2026 13:53:17 +0800 Subject: [PATCH 04/11] ci(jdk_version): pin the version of jdk21 --- .github/actions/ctnh_prepare_workspace/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/ctnh_prepare_workspace/action.yml b/.github/actions/ctnh_prepare_workspace/action.yml index 4b840b6..5323392 100644 --- a/.github/actions/ctnh_prepare_workspace/action.yml +++ b/.github/actions/ctnh_prepare_workspace/action.yml @@ -158,7 +158,7 @@ runs: uses: actions/setup-java@v4 with: distribution: temurin - java-version: '17.0.10' + java-version: '21' - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 From ed7bb6294d66c8c705b11843163a87a7d58769c5 Mon Sep 17 00:00:00 2001 From: Donjuanplatinum Date: Sun, 14 Jun 2026 14:21:39 +0800 Subject: [PATCH 05/11] ci(): fix ci error reports --- .github/actions/ctnh_prepare_workspace/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/ctnh_prepare_workspace/action.yml b/.github/actions/ctnh_prepare_workspace/action.yml index 5323392..85f56e4 100644 --- a/.github/actions/ctnh_prepare_workspace/action.yml +++ b/.github/actions/ctnh_prepare_workspace/action.yml @@ -158,7 +158,7 @@ runs: uses: actions/setup-java@v4 with: distribution: temurin - java-version: '21' + java-version: '17' - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 From cb70b4dcf04a1eb0df0b81c3b243271561b5c6e2 Mon Sep 17 00:00:00 2001 From: Donjuanplatinum Date: Sun, 14 Jun 2026 14:28:08 +0800 Subject: [PATCH 06/11] ci(): fix ci error reports --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 80c2ba1..0d07cf1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -46,7 +46,7 @@ jobs: - name: Build if: steps.filter.outputs.code == 'true' || github.event_name == 'release' || github.event_name == 'workflow_dispatch' working-directory: CTNH-Modules - run: ./gradlew :modules:CTNH-Core:build + run: ./gradlew :modules:CTNH-Core:build --refresh-dependencies - name: Version Suffix if: github.event_name != 'release' && (steps.filter.outputs.code == 'true' || github.event_name == 'workflow_dispatch') From 602cbe7aa4c4c3b08b3c025f25f67f361be14b64 Mon Sep 17 00:00:00 2001 From: Donjuanplatinum Date: Sun, 14 Jun 2026 14:35:14 +0800 Subject: [PATCH 07/11] ci(): fix ci error reports --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0d07cf1..802b730 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,6 +43,10 @@ jobs: token: ${{ github.token }} module_name: ${{ env.MODULE_NAME }} + - name: Clean Gradle Cache + if: steps.filter.outputs.code == 'true' || github.event_name == 'release' || github.event_name == 'workflow_dispatch' + run: rm -rf ~/.gradle/caches/transforms-* ~/.gradle/caches/jars-* + - name: Build if: steps.filter.outputs.code == 'true' || github.event_name == 'release' || github.event_name == 'workflow_dispatch' working-directory: CTNH-Modules From 7f65d43f88aa29f1eb520e05bc9a3fd04838cf77 Mon Sep 17 00:00:00 2001 From: Donjuanplatinum Date: Sun, 14 Jun 2026 14:41:22 +0800 Subject: [PATCH 08/11] ci(): fix ci error reports --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 802b730..0f14324 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,7 +50,7 @@ jobs: - name: Build if: steps.filter.outputs.code == 'true' || github.event_name == 'release' || github.event_name == 'workflow_dispatch' working-directory: CTNH-Modules - run: ./gradlew :modules:CTNH-Core:build --refresh-dependencies + run: ./gradlew :modules:CTNH-Core:build --refresh-dependencies --stacktrace - name: Version Suffix if: github.event_name != 'release' && (steps.filter.outputs.code == 'true' || github.event_name == 'workflow_dispatch') From b243dac282b3116b0bafbcf7af8e0298f3e47434 Mon Sep 17 00:00:00 2001 From: Donjuanplatinum Date: Sun, 14 Jun 2026 15:00:59 +0800 Subject: [PATCH 09/11] ci(): fix ci error reports --- .github/workflows/build.yml | 2 +- build.gradle | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0f14324..87bb3a9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,7 +50,7 @@ jobs: - name: Build if: steps.filter.outputs.code == 'true' || github.event_name == 'release' || github.event_name == 'workflow_dispatch' working-directory: CTNH-Modules - run: ./gradlew :modules:CTNH-Core:build --refresh-dependencies --stacktrace + run: ./gradlew :modules:CTNH-Core:build --stacktrace - name: Version Suffix if: github.event_name != 'release' && (steps.filter.outputs.code == 'true' || github.event_name == 'workflow_dispatch') diff --git a/build.gradle b/build.gradle index 2588a7c..cee52c1 100644 --- a/build.gradle +++ b/build.gradle @@ -134,4 +134,26 @@ configure(ctnhSubprojects) { lombok { version = "1.18.38" } + + // Strip JAR signatures from Forge JARs before lang injection tasks, + // otherwise JarFile verification throws SecurityException when + // ModDevGradle artifact transforms modify signed JAR entries. + tasks.configureEach { + if (it.name.startsWith('injectLangBytecode')) { + it.doFirst { + it.compileClasspath.files.each { file -> + if (file.name.contains('forge') && file.name.endsWith('.jar') && file.exists()) { + project.ant.exec(executable: 'zip', resultproperty: 'zipResult', + failonerror: false) { + arg(value: '-d') + arg(value: file.absolutePath) + arg(value: 'META-INF/*.SF') + arg(value: 'META-INF/*.RSA') + arg(value: 'META-INF/*.DSA') + } + } + } + } + } + } } From b1e276cafe4ed226e50d0f7edc117151410df845 Mon Sep 17 00:00:00 2001 From: Donjuanplatinum Date: Sun, 14 Jun 2026 15:11:16 +0800 Subject: [PATCH 10/11] CI(astral) --- .../actions/ctnh_prepare_workspace/action.yml | 18 ++++++++++++++++++ settings.gradle | 5 +---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.github/actions/ctnh_prepare_workspace/action.yml b/.github/actions/ctnh_prepare_workspace/action.yml index 85f56e4..fbbd476 100644 --- a/.github/actions/ctnh_prepare_workspace/action.yml +++ b/.github/actions/ctnh_prepare_workspace/action.yml @@ -63,6 +63,15 @@ inputs: required: false default: dev + ctnh_astral_repository: + description: CTNH-Astral repository. + required: false + default: CTNH-Team/CTNH-Astral + ctnh_astral_ref: + description: CTNH-Astral ref. + required: false + default: dev + ctpp_repository: description: CTPP repository. required: false @@ -136,6 +145,15 @@ runs: ref: ${{ inputs.ctnh_mana_ref }} path: CTNH-Modules/modules/CTNH-Mana + - name: Checkout CTNH-Astral + if: ${{ inputs.module_name != 'CTNH-Astral' }} + uses: actions/checkout@v4 + with: + token: ${{ inputs.token }} + repository: ${{ inputs.ctnh_astral_repository }} + ref: ${{ inputs.ctnh_astral_ref }} + path: CTNH-Modules/modules/CTNH-Astral + - name: Checkout CTPP if: ${{ inputs.module_name != 'CTPP' }} uses: actions/checkout@v4 diff --git a/settings.gradle b/settings.gradle index 4fa0ecb..305b302 100644 --- a/settings.gradle +++ b/settings.gradle @@ -45,8 +45,5 @@ include "modules:CTPP" include "modules:CTNH-Lib" include "modules:CTNH-Mana" include "modules:CTNH-Energy" +include "modules:CTNH-Astral" include "modules:GregTech-Modern" -def astralDir = file("modules/CTNH-Astral") -if (astralDir.exists() && astralDir.listFiles()?.length > 0) { - include "modules:CTNH-Astral" -} From e2f719e9ce6523ab5b72511e8127e72764100090 Mon Sep 17 00:00:00 2001 From: Donjuanplatinum Date: Sun, 14 Jun 2026 15:28:17 +0800 Subject: [PATCH 11/11] CI() --- .github/workflows/build.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 87bb3a9..52d2899 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,10 +43,6 @@ jobs: token: ${{ github.token }} module_name: ${{ env.MODULE_NAME }} - - name: Clean Gradle Cache - if: steps.filter.outputs.code == 'true' || github.event_name == 'release' || github.event_name == 'workflow_dispatch' - run: rm -rf ~/.gradle/caches/transforms-* ~/.gradle/caches/jars-* - - name: Build if: steps.filter.outputs.code == 'true' || github.event_name == 'release' || github.event_name == 'workflow_dispatch' working-directory: CTNH-Modules