diff --git a/.github/actions/ctnh_prepare_workspace/action.yml b/.github/actions/ctnh_prepare_workspace/action.yml index a574756..34fc337 100644 --- a/.github/actions/ctnh_prepare_workspace/action.yml +++ b/.github/actions/ctnh_prepare_workspace/action.yml @@ -89,6 +89,15 @@ inputs: required: false default: dev + tea_art_repository: + description: CTNH-only Tea Art source repository. + required: false + default: ZhuanTou33212/Botania-Tea-CTNH + tea_art_ref: + description: Pinned CTNH-only Tea Art source revision. + required: false + default: 5ba635bc548a8ab7c7292557991eef973ef6d0e4 + gtm_repository: description: GTM repository. required: false @@ -178,6 +187,15 @@ runs: repository: ${{ inputs.ctnh_cei_repository }} ref: ${{ inputs.ctnh_cei_ref }} path: CTNH-Modules/modules/Create-Enough-Items + - name: Checkout Tea-Art-CTNH + if: ${{ inputs.module_name != 'Tea-Art-CTNH' }} + uses: actions/checkout@v4 + with: + token: ${{ inputs.token }} + repository: ${{ inputs.tea_art_repository }} + ref: ${{ inputs.tea_art_ref }} + path: CTNH-Modules/modules/Tea-Art-CTNH + - name: Checkout GTM if: ${{ inputs.module_name != 'GregTech-Modern' }} uses: actions/checkout@v4 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 22005d4..1a66652 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,7 +54,7 @@ jobs: javac -version java -version echo "=== Gradle build ===" - ./gradlew :modules:CTNH-Core:build --init-script gradle/strip-forge-signatures.init.gradle --stacktrace + ./gradlew :modules:Tea-Art-CTNH:build :modules:CTNH-Core:build --init-script gradle/strip-forge-signatures.init.gradle --stacktrace - name: Version Suffix if: github.event_name != 'release' && (steps.filter.outputs.code == 'true' || github.event_name == 'workflow_dispatch') diff --git a/.gitignore b/.gitignore index c40433d..f70909a 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,5 @@ forge*changelog.txt .mimosa/ .dsh/ dsh-usage/ +/librarian/Botania/ +/librarian/MythicBotany/ diff --git a/.gitmodules b/.gitmodules index 725fef8..d27d007 100644 --- a/.gitmodules +++ b/.gitmodules @@ -33,3 +33,7 @@ path = modules/Create-Enough-Items url = https://github.com/CTNH-Team/Create-Enough-Items.git branch = dev +[submodule "modules/Tea-Art-CTNH"] + path = modules/Tea-Art-CTNH + url = https://github.com/ZhuanTou33212/Botania-Tea-CTNH.git + branch = main diff --git a/AGENTS.md b/AGENTS.md index ae63ad3..e6ce984 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -154,6 +154,7 @@ CTPP registers 8 custom GT recipe types (kinetic/electric via `StressRecipeCapab - Root `ctnhSubprojects` excludes `:modules:GregTech-Modern`; shared CTNH scripts do not configure GTCEu. - `moddevgradle.gradle` passes existing mods `gtceu`, `ctpp`, `biomancy`, `expatternprovider`, `botania`, `bloodmagic`, `create_new_age`, `immersive_aircraft`, and `sophisticatedstorage` to datagen. - Several modules are dirty or untracked in the current worktree; preserve user/submodule changes. +- CTNH-Mana magic integrations: `modules/CTNH-Mana/dependencies.gradle` depends on **Blood Magic** (`ctnh.bloodmagic`, `wayoftime.bloodmagic` rituals), **Apotheosis** (`ctnh.apotheosis`, bosses/affix gear), **Ars Nouveau** (`ctnh.arsnouveau`+`arscreo`), plus Botania/MythicBotany (`ctnh.botania`/`ctnh.mythicbotany`). Rituals, blood-network effects, and magic-integration surfaces in CTNH-Mana reference these mods directly; verify against their APIs before editing. - Module scale (Java files): CTNH-Core 394, CTNH-Mana 253, CTPP 219, CTNH-Bio 175, CTNH-Energy 171, CTNH-Astral 86, CTNH-Lib 57, Create-Enough-Items 31. Guides below use these counts as complexity hints. - Spelling quirks to preserve: Core mixin package is `mixin/dategen` (not `datagen`); CTPP fan-processing package is `data/recipe/fanprocessing` (no underscore); Mana multiblock dirs are correctly spelled `multiblock` (no legacy `Mutiblock`); Core `data/recipe/tconstruct/` is an empty leftover directory. - CEI namespace is `com.ctnh.cei`, not `com.moguang.cei`; it has no `*GTAddon` and no GT recipe registration. diff --git a/modules/CTNH-Astral b/modules/CTNH-Astral index 84a744e..8cc6d06 160000 --- a/modules/CTNH-Astral +++ b/modules/CTNH-Astral @@ -1 +1 @@ -Subproject commit 84a744ea28fc531609bf28d801ed2e8c4713ab13 +Subproject commit 8cc6d06439118f09731b74a80a7a529c3518aabd diff --git a/modules/CTNH-Bio b/modules/CTNH-Bio index 5600625..c09776c 160000 --- a/modules/CTNH-Bio +++ b/modules/CTNH-Bio @@ -1 +1 @@ -Subproject commit 560062546d5b759f4a115af933eaf7f71a0e5915 +Subproject commit c09776ce0b828eb5bda6faecc964cab071985092 diff --git a/modules/CTNH-Core b/modules/CTNH-Core index d2bdbad..2f2996b 160000 --- a/modules/CTNH-Core +++ b/modules/CTNH-Core @@ -1 +1 @@ -Subproject commit d2bdbadcd6306c6f539edf735738748fec60a080 +Subproject commit 2f2996b7218684133344fbdd9839493b490553f2 diff --git a/modules/CTNH-Energy b/modules/CTNH-Energy index 96704e0..d90f69d 160000 --- a/modules/CTNH-Energy +++ b/modules/CTNH-Energy @@ -1 +1 @@ -Subproject commit 96704e0c4750c0023461896c47bf816bd2626f71 +Subproject commit d90f69d56f6d056087518901e37dbee1a9fe386d diff --git a/modules/CTNH-Lib b/modules/CTNH-Lib index 844277e..8856eec 160000 --- a/modules/CTNH-Lib +++ b/modules/CTNH-Lib @@ -1 +1 @@ -Subproject commit 844277e3e2b54a3367e82e46f066fc93244eb329 +Subproject commit 8856eec6f70ad7dd5c8c5424898673c203ddb74b diff --git a/modules/CTNH-Mana b/modules/CTNH-Mana index e938290..e8282c6 160000 --- a/modules/CTNH-Mana +++ b/modules/CTNH-Mana @@ -1 +1 @@ -Subproject commit e938290f4c423e24cdccfbc1be1c50cafa6a7802 +Subproject commit e8282c6b32e28028191634fd2264edcb08781735 diff --git a/modules/CTPP b/modules/CTPP index 6f764b1..1ded198 160000 --- a/modules/CTPP +++ b/modules/CTPP @@ -1 +1 @@ -Subproject commit 6f764b185d1e2f1663a8f4a50245cc99d8330ed5 +Subproject commit 1ded19855656bee309dc9b7101bbdd6f1db0d926 diff --git a/modules/Create-Enough-Items b/modules/Create-Enough-Items index 2165d06..de5bc0e 160000 --- a/modules/Create-Enough-Items +++ b/modules/Create-Enough-Items @@ -1 +1 @@ -Subproject commit 2165d06c972cef2d5cea5d5da6e4fe0990eb09e7 +Subproject commit de5bc0e18d9a02637f2cf2429c67ac12fb6b09c5 diff --git a/modules/GregTech-Modern b/modules/GregTech-Modern index 9fd0922..4035be7 160000 --- a/modules/GregTech-Modern +++ b/modules/GregTech-Modern @@ -1 +1 @@ -Subproject commit 9fd09223ee890ef88968a714ccfb1aeb85b71766 +Subproject commit 4035be7784fd17d461c328aa2bed169b04443541 diff --git a/modules/Tea-Art-CTNH b/modules/Tea-Art-CTNH new file mode 160000 index 0000000..5ba635b --- /dev/null +++ b/modules/Tea-Art-CTNH @@ -0,0 +1 @@ +Subproject commit 5ba635bc548a8ab7c7292557991eef973ef6d0e4 diff --git a/settings.gradle b/settings.gradle index f331710..828076b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -48,3 +48,5 @@ include "modules:CTNH-Energy" include "modules:CTNH-Astral" include "modules:Create-Enough-Items" include "modules:GregTech-Modern" +include "modules:Tea-Art-CTNH" +project(":modules:Tea-Art-CTNH").buildFileName = "ctnh.module.gradle"