diff --git a/config/thaumcraftfix/patches/thaumic_energistics.json b/config/thaumcraftfix/patches/thaumic_energistics.json new file mode 100644 index 00000000..243efcd2 --- /dev/null +++ b/config/thaumcraftfix/patches/thaumic_energistics.json @@ -0,0 +1,36 @@ +[ + { + "key": "ARCANEASSEMBLER", + "ops": [ + { + "op": "move", + "from": "stages/0/required_craft", + "path": "stages/0/required_item" + } + ] + }, + { + "key": "ARCANEINSCRIBER", + "ops": [ + { + "op": "move", + "from": "stages/0/required_craft", + "path": "stages/0/required_item" + } + ] + } + { + "key": "KNOWLEDGECORE", + "ops": [ + { + "op": "remove", + "path": "stages/0/required_craft" + }, + { + "op": "replace", + "path": "stages/0/required_item/0", + "value": "contenttweaker:complex_gearbox" + } + ] + } +] \ No newline at end of file diff --git a/scripts/ThaumcraftGating.zs b/scripts/ThaumcraftGating.zs index bcbc41aa..0b1f7b82 100644 --- a/scripts/ThaumcraftGating.zs +++ b/scripts/ThaumcraftGating.zs @@ -66,15 +66,15 @@ recipes.addShaped(*4, [, .reuse(), ], [, , ]]); -// mods.thaumcraft.ArcaneWorkbench.removeRecipe(); - recipes.removeShaped(); recipes.removeShaped(); -// See thaumcraft/research/LateResearch.zs for related research adjustments +# See scripts/thaumcraft/research/LateResearch.zs for related research adjustments recipes.removeShaped(); recipes.removeShaped(); recipes.removeShaped(); - +# See config/thaumcraftfix/patches/thaumic_energistics.json for related research adjustments +mods.thaumcraft.ArcaneWorkbench.removeRecipe(); +mods.thaumcraft.ArcaneWorkbench.removeRecipe(); mods.thaumcraft.Infusion.removeRecipe(); val arcaneassembler = RecipeBuilder.newBuilder("arcaneassemblerinf","arcane_autoinfuser",120); @@ -93,8 +93,6 @@ arcaneassembler.addItemInput(); arcaneassembler.addItemOutput(); arcaneassembler.build(); -mods.thaumcraft.ArcaneWorkbench.removeRecipe(); - mods.thaumcraft.Crucible.registerRecipe("easierseal1", "", , , [*20,*10]); mods.thaumcraft.Crucible.registerRecipe("easierseal2", "", , , [*20,*10]); mods.thaumcraft.Crucible.registerRecipe("easierseal3", "", , , [*20,*10]); diff --git a/scripts/ToolTips2.zs b/scripts/ToolTips2.zs index ae174e12..1fd9ee81 100644 --- a/scripts/ToolTips2.zs +++ b/scripts/ToolTips2.zs @@ -2612,7 +2612,6 @@ import crafttweaker.item.IItemCondition; .addTooltip(format.red("WARNING: don't combine with Astral Tome, Thaumonomicon, Lexica botania, Necronomicon, Alkahestry")); .addTooltip(format.red("WARNINGS: This is very crashy, you shouldn't need to use it much")); -.addTooltip(format.red("Vis discount does not work with voidseers pearl")); .addTooltip(format.red("HiaggTM had to upgrade his hatch")); diff --git a/scripts/thaumcraft/research/LateResearch.zs b/scripts/thaumcraft/research/LateResearch.zs index be470afb..1d831f67 100644 --- a/scripts/thaumcraft/research/LateResearch.zs +++ b/scripts/thaumcraft/research/LateResearch.zs @@ -10,6 +10,8 @@ import crafttweaker.item.IItemStack; Hard-coded, non-JSON, research pages to replace crafting requirements for consume requirements. This is so we can make these ingredients obtainable through non-crafting recipes, but still make associated research completable. + +See config/thaumcraftfix/patches for research page changes that are JSON-based. */ # Mithrillium plates