From aa9fa946879a9e6750babb5ff0f772822532df76 Mon Sep 17 00:00:00 2001 From: LazyFleshWasTaken <40587985+LazyFleshWasTaken@users.noreply.github.com> Date: Sun, 31 Aug 2025 14:38:29 -0700 Subject: [PATCH 1/2] Unnerf Botania for integration --- .../scripts/ScriptForbiddenMagic.java | 140 ++++++++++-------- .../dreammaster/scripts/ScriptThaumcraft.java | 8 +- 2 files changed, 79 insertions(+), 69 deletions(-) diff --git a/src/main/java/com/dreammaster/scripts/ScriptForbiddenMagic.java b/src/main/java/com/dreammaster/scripts/ScriptForbiddenMagic.java index e52c4cb246..35050a7dcc 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptForbiddenMagic.java +++ b/src/main/java/com/dreammaster/scripts/ScriptForbiddenMagic.java @@ -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"); @@ -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", @@ -298,14 +370,9 @@ 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), + 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), OrePrefixes.dust.get(Materials.AstralSilver), getModItem(Botania.ID, "manaResource", 1, 0, missing), OrePrefixes.dust.get(Materials.AstralSilver), @@ -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( @@ -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) diff --git a/src/main/java/com/dreammaster/scripts/ScriptThaumcraft.java b/src/main/java/com/dreammaster/scripts/ScriptThaumcraft.java index aab2643c38..5c3430900c 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptThaumcraft.java +++ b/src/main/java/com/dreammaster/scripts/ScriptThaumcraft.java @@ -624,11 +624,11 @@ private void thaumaturgy() { "def", "ghi", 'a', - "screwStainlessSteel", + "screwSteeleaf", 'b', "foilSilver", 'c', - "screwStainlessSteel", + "screwSteeleaf", 'd', "foilSilver", 'e', @@ -636,11 +636,11 @@ private void thaumaturgy() { '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)))); From fdd4d26b2e18aa1d950ca1adace31e13c382954c Mon Sep 17 00:00:00 2001 From: LazyFleshWasTaken <40587985+LazyFleshWasTaken@users.noreply.github.com> Date: Sat, 6 Sep 2025 11:14:58 -0700 Subject: [PATCH 2/2] Swap astral silver to salis mundus --- .../java/com/dreammaster/scripts/ScriptForbiddenMagic.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/dreammaster/scripts/ScriptForbiddenMagic.java b/src/main/java/com/dreammaster/scripts/ScriptForbiddenMagic.java index 35050a7dcc..841287f7aa 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptForbiddenMagic.java +++ b/src/main/java/com/dreammaster/scripts/ScriptForbiddenMagic.java @@ -373,11 +373,11 @@ public void loadRecipes() { 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), - 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), - 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(