Skip to content

Equalise Botania-TC integration with Base Thaumcraft #1352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LazyFleshWasTaken wants to merge 11 commits into
base: master
Choose a base branch
from
+82 −72
Open

Equalise Botania-TC integration with Base Thaumcraft #1352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
aa9fa94
Unnerf Botania for integration
LazyFleshWasTaken Aug 31, 2025
d32713e
Merge branch 'master' into unnerfBotaniaIntegration
Dream-Master Sep 6, 2025
fdd4d26
Swap astral silver to salis mundus
LazyFleshWasTaken Sep 6, 2025
4caeebd
Merge branch 'unnerfBotaniaIntegration' of https://github.com/LazyFle…
LazyFleshWasTaken Sep 6, 2025
a79e72b
Merge branch 'master' into unnerfBotaniaIntegration
EnderProyects Sep 27, 2025
245189c
Merge branch 'master' into unnerfBotaniaIntegration
EnderProyects Sep 28, 2025
073d054
Merge branch 'master' into unnerfBotaniaIntegration
Dream-Master Sep 30, 2025
8b3dea1
Merge branch 'master' into unnerfBotaniaIntegration
Dream-Master Oct 1, 2025
9f1f9d7
Merge branch 'master' into unnerfBotaniaIntegration
EnderProyects Oct 5, 2025
ad75542
Merge branch 'master' into unnerfBotaniaIntegration
Dream-Master Oct 13, 2025
ab038b6
Merge branch 'master' into unnerfBotaniaIntegration
EnderProyects Jan 4, 2026
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
146 changes: 78 additions & 68 deletions src/main/java/com/dreammaster/scripts/ScriptForbiddenMagic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,12 @@ public void loadRecipes() {
false);

// WANDS
TCHelper.removeInfusionRecipe(getModItem(ForbiddenMagic.ID, "WandCores", 1, 1, missing));
TCHelper.removeInfusionRecipe(getModItem(ForbiddenMagic.ID, "WandCores", 1, 6, missing));
TCHelper.removeInfusionRecipe(getModItem(ForbiddenMagic.ID, "WandCores", 1, 0, missing));
TCHelper.removeInfusionRecipe(getModItem(ForbiddenMagic.ID, "WandCores", 1, 8, missing));
TCHelper.removeArcaneRecipe(getModItem(ForbiddenMagic.ID, "WandCores", 1, 9, missing));
TCHelper.removeInfusionRecipe(getModItem(ForbiddenMagic.ID, "WandCaps", 1, 0, missing));
TCHelper.clearPages("CAP_manasteel");
TCHelper.clearPages("CAP_terrasteel");
TCHelper.clearPages("CAP_elementium");
Expand Down Expand Up @@ -199,6 +205,72 @@ public void loadRecipes() {
getModItem(BiomesOPlenty.ID, "food", 1, 7, missing))
.setPages(new ResearchPage("derp.research_page.JOURNEY")).setParents("SCHOOLS").setRound()
.setStub().setAutoUnlock().registerResearchItem();
TCHelper.addInfusionCraftingRecipe(
"ROD_infernal",
getModItem(ForbiddenMagic.ID, "WandCores", 1, 1, missing),
7,
new AspectList().add(Aspect.getAspect("superbia"), 16).add(Aspect.getAspect("praecantatio"), 16)
.add(Aspect.getAspect("infernus"), 32).add(Aspect.getAspect("ignis"), 48)
.add(Aspect.getAspect("instrumentum"), 8),
getModItem(Thaumcraft.ID, "WandRod", 1, 6, missing),
getModItem(ForbiddenMagic.ID, "NetherShard", 1, 3, missing),
OrePrefixes.plate.get(Materials.Soularium),
getModItem(Minecraft.ID, "skull", 1, 1, missing),
getModItem(ForbiddenMagic.ID, "NetherShard", 1, 3, missing),
getModItem(Minecraft.ID, "blaze_rod", 1, 0, missing),
getModItem(ForbiddenMagic.ID, "NetherShard", 1, 3, missing),
getModItem(Thaumcraft.ID, "ItemResource", 1, 14, missing),
getModItem(ForbiddenMagic.ID, "NetherShard", 1, 3, missing),
getModItem(Minecraft.ID, "ghast_tear", 1, 0, missing),
OrePrefixes.plate.get(Materials.Soularium));
TCHelper.setResearchAspects(
"ROD_infernal",
new AspectList().add(Aspect.getAspect("infernus"), 15).add(Aspect.getAspect("ignis"), 12)
.add(Aspect.getAspect("aqua"), 9).add(Aspect.getAspect("praecantatio"), 6)
.add(Aspect.getAspect("instrumentum"), 3));
TCHelper.setResearchComplexity("ROD_infernal", 3);
ThaumcraftApi.addWarpToResearch("ROD_infernal", 3);
TCHelper.addInfusionCraftingRecipe(
"ROD_blood",
getModItem(ForbiddenMagic.ID, "WandCores", 1, 6, missing),
9,
new AspectList().add(Aspect.getAspect("aqua"), 16).add(Aspect.getAspect("praecantatio"), 32)
.add(Aspect.getAspect("victus"), 24).add(Aspect.getAspect("exanimis"), 8)
.add(Aspect.getAspect("alienis"), 8),
getModItem(BloodMagic.ID, "masterBloodOrb", 1, 0, missing),
getModItem(BloodMagic.ID, "demonicSlate", 1, 0, missing),
getModItem(BloodMagic.ID, "sanctus", 1, 0, missing),
getModItem(BloodMagic.ID, "magicales", 1, 0, missing),
getModItem(BloodMagic.ID, "incendium", 1, 0, missing),
getModItem(BloodMagic.ID, "aether", 1, 0, missing),
getModItem(BloodMagic.ID, "bloodMagicBaseAlchemyItems", 1, 0, missing),
getModItem(BloodMagic.ID, "demonicSlate", 1, 0, missing),
getModItem(BloodMagic.ID, "terrae", 1, 0, missing),
getModItem(BloodMagic.ID, "tennebrae", 1, 0, missing),
getModItem(BloodMagic.ID, "aquasalus", 1, 0, missing),
getModItem(BloodMagic.ID, "crystallos", 1, 0, missing),
getModItem(BloodMagic.ID, "crepitous", 1, 0, missing));
TCHelper.setResearchAspects(
"ROD_blood",
new AspectList().add(Aspect.getAspect("victus"), 15).add(Aspect.getAspect("aqua"), 12)
.add(Aspect.getAspect("tenebrae"), 9).add(Aspect.getAspect("praecantatio"), 6)
.add(Aspect.getAspect("telum"), 3));
TCHelper.setResearchComplexity("ROD_blood", 3);
ThaumcraftApi.addWarpToResearch("ROD_blood", 3);
TCHelper.addInfusionCraftingRecipe(
"ROD_livingwood",
getModItem(ForbiddenMagic.ID, "WandCores", 1, 8, missing),
9,
new AspectList().add(Aspect.getAspect("arbor"), 32).add(Aspect.getAspect("praecantatio"), 16)
.add(Aspect.getAspect("victus"), 16).add(Aspect.getAspect("sensus"), 8)
.add(Aspect.getAspect("herba"), 8),
getModItem(Botania.ID, "livingwood", 1, 0, missing),
getModItem(Botania.ID, "manaResource", 1, 2, missing),
getModItem(Botania.ID, "rune", 1, 0, missing),
getModItem(Botania.ID, "rune", 1, 1, missing),
getModItem(Botania.ID, "rune", 1, 2, missing),
getModItem(Botania.ID, "rune", 1, 3, missing),
getModItem(Botania.ID, "rune", 1, 8, missing));
new ResearchItem(
"ROD_livingwood",
"FORBIDDEN",
Expand Down Expand Up @@ -298,19 +370,14 @@ public void loadRecipes() {
"CAP_manasteel",
getModItem(ForbiddenMagic.ID, "WandCaps", 1, 4, missing),
6,
new AspectList().add(Aspect.getAspect("potentia"), 64).add(Aspect.getAspect("praecantatio"), 48)
.add(Aspect.getAspect("electrum"), 32).add(Aspect.getAspect("instrumentum"), 24)
.add(Aspect.getAspect("machina"), 24),
getModItem(Thaumcraft.ID, "WandCap", 1, 4, missing),
OrePrefixes.dust.get(Materials.AstralSilver),
getModItem(Botania.ID, "manaResource", 1, 0, missing),
OrePrefixes.dust.get(Materials.AstralSilver),
getModItem(Botania.ID, "manaResource", 1, 0, missing),
OrePrefixes.dust.get(Materials.AstralSilver),
new AspectList().add(Aspect.getAspect("potentia"), 40).add(Aspect.getAspect("praecantatio"), 24)
.add(Aspect.getAspect("auram"), 24).add(Aspect.getAspect("sensus"), 8),
getModItem(Thaumcraft.ID, "WandCap", 1, 5, missing),
getModItem(Thaumcraft.ID, "ItemResource", 1, 14, missing),
getModItem(Botania.ID, "manaResource", 1, 0, missing),
OrePrefixes.dust.get(Materials.AstralSilver),
getModItem(Thaumcraft.ID, "ItemResource", 1, 14, missing),
getModItem(Botania.ID, "manaResource", 1, 0, missing),
OrePrefixes.dust.get(Materials.AstralSilver),
getModItem(Thaumcraft.ID, "ItemResource", 1, 14, missing),
getModItem(Botania.ID, "manaResource", 1, 0, missing));
TCHelper.addResearchPage("CAP_manasteel", new ResearchPage("derp.research_page.CAP_manasteel"));
TCHelper.addResearchPage(
Expand Down Expand Up @@ -505,11 +572,6 @@ public void loadRecipes() {
TCHelper.removeInfusionRecipe(getModItem(ForbiddenMagic.ID, "EldritchOrb", 1, 0, missing));
TCHelper.removeArcaneRecipe(getModItem(ForbiddenMagic.ID, "Primewell", 1, 0, missing));
TCHelper.removeInfusionRecipe(getModItem(ForbiddenMagic.ID, "SubCollar", 1, 0, missing));
TCHelper.removeInfusionRecipe(getModItem(ForbiddenMagic.ID, "WandCores", 1, 1, missing));
TCHelper.removeInfusionRecipe(getModItem(ForbiddenMagic.ID, "WandCores", 1, 6, missing));
TCHelper.removeInfusionRecipe(getModItem(ForbiddenMagic.ID, "WandCores", 1, 0, missing));
TCHelper.removeArcaneRecipe(getModItem(ForbiddenMagic.ID, "WandCores", 1, 9, missing));
TCHelper.removeInfusionRecipe(getModItem(ForbiddenMagic.ID, "WandCaps", 1, 0, missing));
TCHelper.clearPages("RIDINGCROP");
TCHelper.addResearchPage("RIDINGCROP", new ResearchPage("forbidden.research_page.RIDINGCROP.1"));
ThaumcraftApi.addArcaneCraftingRecipe(
Expand Down Expand Up @@ -1075,58 +1137,6 @@ public void loadRecipes() {
.add(Aspect.getAspect("iter"), 12).add(Aspect.getAspect("praecantatio"), 9)
.add(Aspect.getAspect("potentia"), 6).add(Aspect.getAspect("lux"), 3));
TCHelper.setResearchComplexity("HELLFIRE", 3);
TCHelper.addInfusionCraftingRecipe(
"ROD_infernal",
getModItem(ForbiddenMagic.ID, "WandCores", 1, 1, missing),
7,
new AspectList().add(Aspect.getAspect("superbia"), 16).add(Aspect.getAspect("praecantatio"), 16)
.add(Aspect.getAspect("infernus"), 32).add(Aspect.getAspect("ignis"), 48)
.add(Aspect.getAspect("instrumentum"), 8),
getModItem(Thaumcraft.ID, "WandRod", 1, 6, missing),
getModItem(ForbiddenMagic.ID, "NetherShard", 1, 3, missing),
OrePrefixes.plate.get(Materials.Soularium),
getModItem(Minecraft.ID, "skull", 1, 1, missing),
getModItem(ForbiddenMagic.ID, "NetherShard", 1, 3, missing),
getModItem(Minecraft.ID, "blaze_rod", 1, 0, missing),
getModItem(ForbiddenMagic.ID, "NetherShard", 1, 3, missing),
getModItem(Thaumcraft.ID, "ItemResource", 1, 14, missing),
getModItem(ForbiddenMagic.ID, "NetherShard", 1, 3, missing),
getModItem(Minecraft.ID, "ghast_tear", 1, 0, missing),
OrePrefixes.plate.get(Materials.Soularium));
TCHelper.setResearchAspects(
"ROD_infernal",
new AspectList().add(Aspect.getAspect("infernus"), 15).add(Aspect.getAspect("ignis"), 12)
.add(Aspect.getAspect("aqua"), 9).add(Aspect.getAspect("praecantatio"), 6)
.add(Aspect.getAspect("instrumentum"), 3));
TCHelper.setResearchComplexity("ROD_infernal", 3);
ThaumcraftApi.addWarpToResearch("ROD_infernal", 3);
TCHelper.addInfusionCraftingRecipe(
"ROD_blood",
getModItem(ForbiddenMagic.ID, "WandCores", 1, 6, missing),
9,
new AspectList().add(Aspect.getAspect("aqua"), 16).add(Aspect.getAspect("praecantatio"), 32)
.add(Aspect.getAspect("victus"), 24).add(Aspect.getAspect("exanimis"), 8)
.add(Aspect.getAspect("alienis"), 8),
getModItem(BloodMagic.ID, "masterBloodOrb", 1, 0, missing),
getModItem(BloodMagic.ID, "demonicSlate", 1, 0, missing),
getModItem(BloodMagic.ID, "sanctus", 1, 0, missing),
getModItem(BloodMagic.ID, "magicales", 1, 0, missing),
getModItem(BloodMagic.ID, "incendium", 1, 0, missing),
getModItem(BloodMagic.ID, "aether", 1, 0, missing),
getModItem(BloodMagic.ID, "bloodMagicBaseAlchemyItems", 1, 0, missing),
getModItem(BloodMagic.ID, "demonicSlate", 1, 0, missing),
getModItem(BloodMagic.ID, "terrae", 1, 0, missing),
getModItem(BloodMagic.ID, "tennebrae", 1, 0, missing),
getModItem(BloodMagic.ID, "aquasalus", 1, 0, missing),
getModItem(BloodMagic.ID, "crystallos", 1, 0, missing),
getModItem(BloodMagic.ID, "crepitous", 1, 0, missing));
TCHelper.setResearchAspects(
"ROD_blood",
new AspectList().add(Aspect.getAspect("victus"), 15).add(Aspect.getAspect("aqua"), 12)
.add(Aspect.getAspect("tenebrae"), 9).add(Aspect.getAspect("praecantatio"), 6)
.add(Aspect.getAspect("telum"), 3));
TCHelper.setResearchComplexity("ROD_blood", 3);
ThaumcraftApi.addWarpToResearch("ROD_blood", 3);
TCHelper.setResearchAspects(
"CONSUMING",
new AspectList().add(Aspect.getAspect("vacuos"), 18).add(Aspect.getAspect("praecantatio"), 15)
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/dreammaster/scripts/ScriptThaumcraft.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,23 +625,23 @@ private void thaumaturgy() {
"def",
"ghi",
'a',
"screwStainlessSteel",
"screwSteeleaf",
'b',
"foilSilver",
'c',
"screwStainlessSteel",
"screwSteeleaf",
'd',
"foilSilver",
'e',
"ringSilver",
'f',
"foilSilver",
'g',
"screwStainlessSteel",
"screwSteeleaf",
'h',
"foilSilver",
'i',
"screwStainlessSteel");
"screwSteeleaf");
TCHelper.addResearchPage(
"CAP_silver",
new ResearchPage(TCHelper.findArcaneRecipe(getModItem(Thaumcraft.ID, "WandCap", 1, 5, missing))));
Expand Down