Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .github/actions/ctnh_prepare_workspace/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,5 @@ forge*changelog.txt
.mimosa/
.dsh/
dsh-usage/
/librarian/Botania/
/librarian/MythicBotany/
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
2 changes: 1 addition & 1 deletion modules/CTNH-Astral
Submodule CTNH-Astral updated 481 files
2 changes: 1 addition & 1 deletion modules/CTNH-Bio
Submodule CTNH-Bio updated 297 files
2 changes: 1 addition & 1 deletion modules/CTNH-Core
Submodule CTNH-Core updated 169 files
2 changes: 1 addition & 1 deletion modules/CTNH-Energy
Submodule CTNH-Energy updated 167 files
2 changes: 1 addition & 1 deletion modules/CTNH-Lib
Submodule CTNH-Lib updated 34 files
+37 −1 .github/actions/ctnh_prepare_workspace/action.yml
+4 −0 .gitignore
+0 −39 AGENTS.md
+62 −0 src/main/java/tech/vixhentx/mcmod/ctnhlib/api/CTNHValues.java
+133 −0 src/main/java/tech/vixhentx/mcmod/ctnhlib/api/CrossParallelRecipeLogic.java
+15 −0 src/main/java/tech/vixhentx/mcmod/ctnhlib/api/ICrossParallelRecipeLogicMachine.java
+0 −6 src/main/java/tech/vixhentx/mcmod/ctnhlib/client/gui/IRCFancyUIProvider.java
+0 −39 src/main/java/tech/vixhentx/mcmod/ctnhlib/client/gui/RCUIWidget.java
+0 −454 src/main/java/tech/vixhentx/mcmod/ctnhlib/client/gui/RightConfiguratorPanel.java
+195 −0 src/main/java/tech/vixhentx/mcmod/ctnhlib/command/CTNHCommandChatHelper.java
+233 −0 src/main/java/tech/vixhentx/mcmod/ctnhlib/command/CTNHCommandInspector.java
+392 −0 src/main/java/tech/vixhentx/mcmod/ctnhlib/command/CTNHCommands.java
+16 −4 src/main/java/tech/vixhentx/mcmod/ctnhlib/common/CommonProxy.java
+171 −0 src/main/java/tech/vixhentx/mcmod/ctnhlib/data/recipe/RecipeRemovalHelper.java
+0 −109 src/main/java/tech/vixhentx/mcmod/ctnhlib/jade/GTProvidersRegistrar.java
+0 −95 src/main/java/tech/vixhentx/mcmod/ctnhlib/jade/JadePriorityManager.java
+0 −47 src/main/java/tech/vixhentx/mcmod/ctnhlib/mixin/GTJadePluginMixin.java
+0 −25 src/main/java/tech/vixhentx/mcmod/ctnhlib/mixin/MiscForgeHelperMixin.java
+33 −0 src/main/java/tech/vixhentx/mcmod/ctnhlib/mixin/RecipeManagerApplyMixin.java
+9 −1 src/main/java/tech/vixhentx/mcmod/ctnhlib/registrate/CNRegistrate.java
+1 −1 src/main/java/tech/vixhentx/mcmod/ctnhlib/registrate/builders/CTNHMaterial.java
+30 −0 src/main/java/tech/vixhentx/mcmod/ctnhlib/registrate/builders/CTNHRecipeCategory.java
+1 −1 src/main/java/tech/vixhentx/mcmod/ctnhlib/registrate/builders/CTNHTagPrefix.java
+14 −1 src/main/java/tech/vixhentx/mcmod/ctnhlib/registrate/data/ProviderTypes.java
+25 −0 src/main/java/tech/vixhentx/mcmod/ctnhlib/utils/AllBuilder2.java
+695 −0 src/main/java/tech/vixhentx/mcmod/ctnhlib/utils/ChunkList.java
+27 −0 src/main/java/tech/vixhentx/mcmod/ctnhlib/utils/CodecBuilder.java
+361 −0 src/main/java/tech/vixhentx/mcmod/ctnhlib/utils/InfiniteMeteorTerrain.java
+1,952 −0 src/main/java/tech/vixhentx/mcmod/ctnhlib/utils/LockIdentityHashMap.java
+322 −0 src/main/java/tech/vixhentx/mcmod/ctnhlib/utils/MachineUtils.java
+7 −0 src/main/resources/META-INF/mods.toml
+36 −0 src/main/resources/assets/ctnhlib/lang/en_us.json
+36 −0 src/main/resources/assets/ctnhlib/lang/zh_cn.json
+1 −2 src/main/resources/ctnhlib.mixins.json
2 changes: 1 addition & 1 deletion modules/CTNH-Mana
Submodule CTNH-Mana updated 437 files
2 changes: 1 addition & 1 deletion modules/CTPP
Submodule CTPP updated from 6f764b to 1ded19
2 changes: 1 addition & 1 deletion modules/Create-Enough-Items
Submodule Create-Enough-Items updated 44 files
+193 −0 .github/actions/ctnh_prepare_workspace/action.yml
+92 −0 .github/workflows/build.yml
+48 −0 .github/workflows/spotless.yml
+172 −3 README.md
+4 −4 src/main/java/com/ctnh/cei/CreateEnoughItems.java
+5 −3 src/main/java/com/ctnh/cei/client/ClientProxy.java
+3 −3 src/main/java/com/ctnh/cei/common/CommonProxy.java
+2 −2 src/main/java/com/ctnh/cei/data/CEIDatagen.java
+31 −0 src/main/java/com/ctnh/cei/event/ForgeClientEventHandler.java
+13 −0 src/main/java/com/ctnh/cei/mixin/accessor/EditBoxAccessor.java
+95 −0 src/main/java/com/ctnh/cei/mixin/create/CreateJEIMixin.java
+219 −0 src/main/java/com/ctnh/cei/mixin/emi/EmiApiTagExpandMixin.java
+42 −0 src/main/java/com/ctnh/cei/mixin/emi/EmiRecipesMixin.java
+573 −0 src/main/java/com/ctnh/cei/mixin/emi/EmiScreenManagerInputMixin.java
+100 −0 src/main/java/com/ctnh/cei/mixin/emi/EmiScreenManagerMixin.java
+28 −5 src/main/java/com/ctnh/cei/mixin/emi/EmiScreenManagerScreenSpaceMixin.java
+83 −0 src/main/java/com/ctnh/cei/mixin/emi/EmiSearchMixin.java
+29 −0 src/main/java/com/ctnh/cei/mixin/emi/EmiTagsMixin.java
+229 −0 src/main/java/com/ctnh/cei/mixin/emi/RecipeScreenMixin.java
+14 −0 src/main/java/com/ctnh/cei/mixin/emi/accessor/GTEmiRecipeAccessor.java
+32 −0 src/main/java/com/ctnh/cei/mixin/tmrv/RecipeManagerMixin.java
+2 −2 src/main/java/com/ctnh/cei/registry/CEIRegistrate.java
+57 −0 src/main/java/com/ctnh/cei/utils/emi/TooltipBakeQueue.java
+266 −24 src/main/java/com/ctnh/cei/utils/emi/collapsible/CEICollapsibleGroups.java
+11 −0 src/main/java/com/ctnh/cei/utils/emi/duplicate/CEIDuplicateRecipeScreen.java
+137 −0 src/main/java/com/ctnh/cei/utils/emi/duplicate/CEIDuplicateRecipes.java
+11 −0 src/main/java/com/ctnh/cei/utils/emi/featured/CEIFeaturedRecipeScreen.java
+518 −0 src/main/java/com/ctnh/cei/utils/emi/featured/CEIFeaturedRecipes.java
+99 −0 src/main/java/com/ctnh/cei/utils/emi/search/CEIAssociatedSearch.java
+11 −0 src/main/java/com/ctnh/cei/utils/emi/search/CEIAssociatedSearchRecipeScreen.java
+145 −0 src/main/java/com/ctnh/cei/utils/emi/search/CEIEmiDragSearchFill.java
+127 −0 src/main/java/com/ctnh/cei/utils/emi/search/FastRecipeManager.java
+27 −0 src/main/java/com/ctnh/cei/utils/emi/search/TagRelationGraph.java
+179 −0 src/main/java/com/ctnh/cei/utils/emi/voltage/CEIVoltageRecipeFilter.java
+23 −0 src/main/java/com/ctnh/cei/utils/emi/voltage/CEIVoltageRecipeScreen.java
+0 −0 src/main/java/com/moguang/cei/mixin/.gitkeep
+0 −8 src/main/java/com/moguang/cei/mixin/LevelMixin.java
+0 −164 src/main/java/com/moguang/cei/mixin/emi/EmiScreenManagerInputMixin.java
+0 −17 src/main/java/com/moguang/cei/mixin/emi/EmiSearchMixin.java
+207 −0 src/main/resources/assets/cei/emi/emi_collapsible_groups.json
+11 −0 src/main/resources/assets/cei/emi/emi_featured_recipes.json
+16 −1 src/main/resources/assets/cei/lang/en_us.json
+16 −1 src/main/resources/assets/cei/lang/zh_cn.json
+12 −3 src/main/resources/cei.mixins.json
2 changes: 1 addition & 1 deletion modules/GregTech-Modern
1 change: 1 addition & 0 deletions modules/Tea-Art-CTNH
Submodule Tea-Art-CTNH added at 5ba635
2 changes: 2 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"