Restore recipes in certain research pages

- Also fix kami recipes

.gitignore

@@ -0,0 +1 @@
+/.idea/

config/ZenUtils.cfg

@@ -1,8 +1,27 @@
 # Configuration file
 
 general {
+    # Allow insertion of zs execution during mod loading stage
+    # Format: scriptLoaderName;modid;stageMarker;before|after
+    # Valid stage marker: C (Construction) H (Preinit) I (Init) J (Postinit) A (Available)
+    # Example: custom;mekanism;J;before -> runs `#loader custom` scripts before mekanism runs its code on post-initialization stage
+    # Note: 
+    # 1. On construction stage and preinit stage before crafttweaker, only native methods are available
+    # 2. Many recipe modifications are staged. For example, scripts are loaded on init, but recipe modifications for crafting table and furnace are staged on postinit
+    #    It means recipe modifications MAY NOT be executed after their loading stage
+    #    ZenUtils will re-execute crafttweaker recipe modifications after all custom script load entrypoint on POSTINIT, but other crafttweaker addons not
+    S:customScriptEntrypoint <
+        lateAddTC;modtweaker;A;after
+     >
+
+    # Enable mixinzs. Default: false
     B:enableMixin=true
+
+    # Enable RandomTickEvent. It patches hotspot random tick code, which may produce performance loss. Do not enable it if you don't need it. Default: false
     B:enableRandomTickEvent=false
+
+    # Enable fast script loading. Note: If enabled, ONLY PREPROCESSORS AT SCRIPT HEADER ARE EFFECTIVE. (except mixin scripts) Default: false
+    B:fastScriptLoading=false
 }
 
 

scripts/ThaumcraftGating.zs

@@ -108,53 +108,6 @@ mods.thaumcraft.Infusion.registerRecipe("infuseshimmerleaf", "",
 <aoa3:holly_top_seeds>, 
 [<thaumcraft:quicksilver>, <thaumcraft:quicksilver>, <thaumcraft:quicksilver>, <thaumcraft:quicksilver>]);
 
-
-mods.thaumcraft.Infusion.removeRecipe(<thaumictinkerer:kami_chest>);
-
-mods.thaumcraft.Infusion.registerRecipe("infkamichest", "", 
-<thaumictinkerer:kami_chest>, 10, 
-[<aspect:lux>*250,<aspect:aer>*150,<aspect:praemunio>*125,<aspect:volatus>*125,<aspect:ordo>*125,<aspect:alienis>*60], 
-<thaumictinkerer:ichor_chest>, 
-[<thaumadditions:mithrillium_ingot>, <thaumadditions:mithrillium_ingot>,
- <thaumictinkerer:kamiresource:2>, <thaumictinkerer:kamiresource:2>,
- <minecraft:chorus_fruit_popped>, <minecraft:golden_chestplate>,
- <thaumcraft:cloud_ring>, <minecraft:elytra>,
- <minecraft:shield>, <minecraft:feather>,
- <minecraft:ghast_tear>, <minecraft:arrow>]);
-
-mods.thaumcraft.Infusion.registerRecipe("infkamiboots", "", 
-<thaumictinkerer:kami_boots>, 10, 
-[<aspect:lux>*250,<aspect:terra>*150,<aspect:praemunio>*125,<aspect:instrumentum>*125,<aspect:motus>*125,<aspect:volatus>*60], 
-<thaumictinkerer:ichor_boots>, 
-[<thaumadditions:mithrillium_ingot>, <thaumadditions:mithrillium_ingot>,
- <thaumictinkerer:kamiresource:2>, <thaumictinkerer:kamiresource:2>,
- <minecraft:chorus_fruit_popped>, <minecraft:golden_boots>,
- <minecraft:wheat_seeds>, <minecraft:grass>,
- <thaumcraft:lamp_growth>, <thaumcraft:turret>,
- <minecraft:wool:0>, <minecraft:lead>]);
-
- mods.thaumcraft.Infusion.registerRecipe("infkamilegs", "", 
-<thaumictinkerer:kami_legs>, 10, 
-[<aspect:lux>*250,<aspect:ignis>*150,<aspect:praemunio>*125,<aspect:volatus>*125,<aspect:ordo>*125,<aspect:alienis>*60], 
-<thaumictinkerer:ichor_legs>, 
-[<thaumadditions:mithrillium_ingot>, <thaumadditions:mithrillium_ingot>,
- <thaumictinkerer:kamiresource:2>, <thaumictinkerer:kamiresource:2>,
- <minecraft:chorus_fruit_popped>, <minecraft:golden_leggings>,
- <minecraft:potion>.withTag({Potion: "minecraft:fire_resistance"}), <thaumictinkerer:energetic_nitor>,
- <thaumcraft:lamp_arcane>, <minecraft:lava_bucket>,
- <minecraft:fire_charge>, <minecraft:blaze_rod>]);
-
- mods.thaumcraft.Infusion.registerRecipe("infkamihelm", "", 
-<thaumictinkerer:kami_helm>, 10, 
-[<aspect:lux>*250,<aspect:aqua>*150,<aspect:auram>*125,<aspect:praemunio>*125,<aspect:cognitio>*125,<aspect:victus>*60], 
-<thaumictinkerer:ichor_helm>, 
-[<thaumadditions:mithrillium_ingot>, <thaumadditions:mithrillium_ingot>,
- <thaumictinkerer:kamiresource:2>, <thaumictinkerer:kamiresource:2>,
- <minecraft:chorus_fruit_popped>, <minecraft:golden_helmet>,
- <minecraft:potion>.withTag({Potion: "minecraft:night_vision"}), <thaumictinkerer:energetic_nitor>,
- <thaumcraft:goggles>, <minecraft:ghast_tear>,
- <minecraft:fish>, <minecraft:cake>]);
-
 recipes.addShaped(<thaumictinkerer:kamiresource:3>,
 [[null, <aoa3:blazium_ingot>, null],
 [<thaumictinkerer:kamiresource:2>, <thaumcraft:ingot:0>, <thaumictinkerer:kamiresource:2>],

scripts/thaumcraft/infusion/LateInfusionRecipes.zs

@@ -0,0 +1,110 @@
+#modloaded thaumcraft modtweaker
+#loader lateAddTC
+import native.com.blamejared.compat.thaumcraft.handlers.ThaumCraft;
+import native.com.blamejared.mtlib.helpers.InputHelper;
+import native.net.minecraft.util.ResourceLocation;
+import native.thaumcraft.api.ThaumcraftApi;
+import native.thaumcraft.api.ThaumcraftApiHelper;
+import native.thaumcraft.api.crafting.InfusionRecipe;
+
+import crafttweaker.item.IIngredient;
+import crafttweaker.item.IItemStack;
+import thaumcraft.aspect.CTAspectStack;
+
+/*
+Infusion recipes that REPLACE existing recipes tied to research. Removal is unnecssary, the recipes will be overwritten.
+This is to keep the recipe available in the research page.
+*/
+var tcAdditions = "thaumadditions";
+var tcTinkerer = "thaumictinkerer";
+# KAMI armor
+registerInfusionRecipeFromAddon(`${tcTinkerer}:kami_helm`, "TT_KAMIHELM",
+  <thaumictinkerer:kami_helm>, 32, 
+  [
+    <aspect:aqua> * 150, <aspect:auram> * 125, <aspect:cognitio> * 125,
+    <aspect:victus> * 60, <aspect:lux> * 250, <aspect:praemunio> * 125
+  ], 
+  <thaumictinkerer:ichor_helm>, 
+  [
+    <thaumadditions:mithrillium_ingot>, <thaumadditions:mithrillium_ingot>, <thaumictinkerer:kamiresource:2>,
+    <thaumictinkerer:kamiresource:2>, <minecraft:chorus_fruit_popped>, <minecraft:golden_helmet>,
+    <minecraft:potion>.withTag({Potion: "minecraft:night_vision"}), <thaumcraft:goggles>, <minecraft:ghast_tear>,
+    <minecraft:fish>, <minecraft:cake>, <minecraft:ender_eye>
+  ]
+);
+registerInfusionRecipeFromAddon(`${tcTinkerer}:kami_chest`, "TT_KAMICHEST",
+  <thaumictinkerer:kami_chest>, 32, 
+  [
+    <aspect:aer> * 150, <aspect:praemunio> * 125, <aspect:volatus> * 125,
+    <aspect:ordo> * 125, <aspect:lux> * 250, <aspect:alienis> * 60
+  ], 
+  <thaumictinkerer:ichor_chest>, 
+  [
+    <thaumadditions:mithrillium_ingot>, <thaumadditions:mithrillium_ingot>, <thaumictinkerer:kamiresource:2>,
+    <thaumictinkerer:kamiresource:2>, <minecraft:chorus_fruit_popped>, <minecraft:golden_chestplate>,
+    <thaumcraft:cloud_ring>, <minecraft:elytra>, <minecraft:shield>,
+    <minecraft:feather>, <minecraft:ghast_tear>, <minecraft:arrow>
+  ]
+);
+registerInfusionRecipeFromAddon(`${tcTinkerer}:kami_legs`, "TT_KAMILEGS",
+  <thaumictinkerer:kami_legs>, 32, 
+  [
+    <aspect:aer> * 150, <aspect:praemunio> * 125, <aspect:volatus> * 125,
+    <aspect:ordo> * 125, <aspect:lux> * 250, <aspect:alienis> * 60
+  ], 
+  <thaumictinkerer:ichor_legs>, 
+  [
+    <thaumadditions:mithrillium_ingot>, <thaumadditions:mithrillium_ingot>, <thaumictinkerer:kamiresource:2>,
+    <thaumictinkerer:kamiresource:2>, <minecraft:chorus_fruit_popped>, <minecraft:golden_leggings>,
+    <minecraft:potion>.withTag({Potion: "minecraft:fire_resistance"}), <thaumictinkerer:energetic_nitor>, <thaumcraft:lamp_arcane>,
+    <minecraft:lava_bucket>, <minecraft:fire_charge>, <minecraft:blaze_rod>
+  ]
+);
+registerInfusionRecipeFromAddon(`${tcTinkerer}:kami_boots`, "TT_KAMIBOOTS",
+  <thaumictinkerer:kami_boots>, 32, 
+  [
+    <aspect:terra> * 150, <aspect:praemunio> * 125, <aspect:instrumentum> * 125,
+    <aspect:motus> * 125, <aspect:lux> * 250, <aspect:herba> * 60,
+    <aspect:volatus> * 60
+  ], 
+  <thaumictinkerer:ichor_boots>, 
+  [
+    <thaumadditions:mithrillium_ingot>, <thaumadditions:mithrillium_ingot>, <thaumictinkerer:kamiresource:2>,
+    <thaumictinkerer:kamiresource:2>, <minecraft:chorus_fruit_popped>, <minecraft:golden_boots>,
+    <minecraft:grass>, <minecraft:wheat_seeds>, <thaumcraft:lamp_growth>,
+    <thaumcraft:turret:2>, <minecraft:wool:0>, <minecraft:lead>
+  ]
+);
+
+# Fix crystal crusher in JEI
+registerInfusionRecipeFromAddon(`${tcAdditions}:crystal_crusher`, "TAR_CRYSTAL_CRUSHER", 
+  <thaumadditions:crystal_crusher>, 3,
+  [
+    <aspect:fabrico> * 20, <aspect:exitium> * 20, <aspect:instrumentum> * 20
+  ],
+  <thaumcraft:mechanism_complex>,
+  [
+    makeCrystal(<aspect:aer>), makeCrystal(<aspect:terra>), makeCrystal(<aspect:ignis>),
+    makeCrystal(<aspect:aqua>), makeCrystal(<aspect:ordo>), makeCrystal(<aspect:perditio>),
+    <thaumcraft:plate:2>, <thaumcraft:plate:2>, <thaumcraft:plate:2>,
+    <thaumcraft:slab_arcane_stone>, <thaumcraft:slab_arcane_stone>, <thaumcraft:slab_arcane_stone>,
+    <thaumadditions:salt_essence>.withTag({Aspects: [{amount: 1, key: "praemunio"}]}), <thaumadditions:salt_essence>.withTag({Aspects: [{amount: 1, key: "praemunio"}]})
+  ]
+);
+
+/*
+  The same as Infusion.registerRecipe(), but allows a namespace in the resource location.
+  ModTweaker only allows infusion recipes with the "thaumcraft" namespace, this allows any namespace.
+*/
+function registerInfusionRecipeFromAddon(resourceLocation as string, research as string, output as IItemStack, instability as int,
+                                          aspects as CTAspectStack[], centralItem as IIngredient, recipe as IIngredient[]) {
+  var infusionRecipe = InfusionRecipe(
+    research, output.native, instability,
+    ThaumCraft.getAspects(aspects), centralItem.native, InputHelper.toObjects(recipe)
+  );
+  ThaumcraftApi.addInfusionCraftingRecipe(ResourceLocation(resourceLocation), infusionRecipe);
+}
+
+function makeCrystal(aspect as CTAspectStack) as IItemStack {
+  return ThaumcraftApiHelper.makeCrystal(ThaumCraft.getAspect(aspect)).wrapper;
+}