From c98ce43a8f56c6fff1553aa3c126498f0c8289bb Mon Sep 17 00:00:00 2001 From: koolkrafter5 Date: Thu, 12 Feb 2026 03:33:13 -0500 Subject: [PATCH] Clean up research classes --- .../spiteful/forbidden/ForbiddenResearch.java | 268 ++++++++---------- .../spiteful/forbidden/compat/BloodMagic.java | 76 ++--- .../forbidden/compat/ForbiddenBotany.java | 129 +++++---- 3 files changed, 238 insertions(+), 235 deletions(-) diff --git a/src/main/java/fox/spiteful/forbidden/ForbiddenResearch.java b/src/main/java/fox/spiteful/forbidden/ForbiddenResearch.java index 4e2f290..1321744 100644 --- a/src/main/java/fox/spiteful/forbidden/ForbiddenResearch.java +++ b/src/main/java/fox/spiteful/forbidden/ForbiddenResearch.java @@ -44,9 +44,9 @@ public class ForbiddenResearch { 1, new ItemStack(ForbiddenItems.crystalwell, 1, 0))) .setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.CRYSTALWELL.1"), - new ResearchPage((IArcaneRecipe) recipes.get("Crystalwell")) }) - .setParents(new String[] { "RESEARCH" }).registerResearchItem(); + new ResearchPage("forbidden.research_page.CRYSTALWELL.1"), + new ResearchPage((IArcaneRecipe) recipes.get("Crystalwell"))) + .setParents("RESEARCH").registerResearchItem(); else(new DarkResearchItem( "CRYSTALWELL", "FORBIDDEN", @@ -56,9 +56,9 @@ public class ForbiddenResearch { 1, new ItemStack(ForbiddenItems.crystalwell, 1, 0))) .setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.CRYSTALWELL.1b"), - new ResearchPage((IArcaneRecipe) recipes.get("Crystalwell")) }) - .setParents(new String[] { "RESEARCH" }).registerResearchItem(); + new ResearchPage("forbidden.research_page.CRYSTALWELL.1b"), + new ResearchPage((IArcaneRecipe) recipes.get("Crystalwell"))) + .setParents("RESEARCH").registerResearchItem(); (new DarkResearchItem( "PRIMEWELL", @@ -69,9 +69,9 @@ public class ForbiddenResearch { 1, new ItemStack(ForbiddenItems.primewell, 1, 0))) .setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.PRIMEWELL.1"), - new ResearchPage((IArcaneRecipe) recipes.get("Primewell")) }) - .setParents(new String[] { "PRIMPEARL" }).setConcealed().registerResearchItem(); + new ResearchPage("forbidden.research_page.PRIMEWELL.1"), + new ResearchPage((IArcaneRecipe) recipes.get("Primewell"))) + .setParents("PRIMPEARL").setConcealed().registerResearchItem(); if (Config.emeraldTrans) (new DarkResearchItem( "TRANSEMERALD", "FORBIDDEN", @@ -81,9 +81,9 @@ public class ForbiddenResearch { 3, new ItemStack(ForbiddenItems.resource, 1, 0))) .setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.TRANSEMERALD.1"), - new ResearchPage((CrucibleRecipe) recipes.get("TransEmerald")) }) - .setSecondary().setConcealed().setParents(new String[] { "TRANSGOLD" }).registerResearchItem(); + new ResearchPage("forbidden.research_page.TRANSEMERALD.1"), + new ResearchPage((CrucibleRecipe) recipes.get("TransEmerald"))) + .setSecondary().setConcealed().setParents("TRANSGOLD").registerResearchItem(); (new DarkResearchItem( "BLACKFLOWER", "FORBIDDEN", @@ -93,10 +93,10 @@ public class ForbiddenResearch { 1, new ItemStack(ForbiddenBlocks.blackFlower, 1, 0))) .setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.BLACKFLOWER.1"), - new ResearchPage((CrucibleRecipe) recipes.get("BlackFlower")), - new ResearchPage((IRecipe) recipes.get("BlackInk")) }) - .setAspectTriggers(new Aspect[] { Aspect.SENSES }).registerResearchItem(); + new ResearchPage("forbidden.research_page.BLACKFLOWER.1"), + new ResearchPage((CrucibleRecipe) recipes.get("BlackFlower")), + new ResearchPage((IRecipe) recipes.get("BlackInk"))) + .setAspectTriggers(Aspect.SENSES).registerResearchItem(); (new DarkResearchItem( "RIDINGCROP", "FORBIDDEN", @@ -106,8 +106,8 @@ public class ForbiddenResearch { 0, new ItemStack(ForbiddenItems.ridingCrop))) .setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.RIDINGCROP.1"), - new ResearchPage((IRecipe) recipes.get("RidingCrop")) }) + new ResearchPage("forbidden.research_page.RIDINGCROP.1"), + new ResearchPage((IRecipe) recipes.get("RidingCrop"))) .setStub().setRound().setAutoUnlock().registerResearchItem(); if (Config.enchanting) { @@ -120,10 +120,9 @@ public class ForbiddenResearch { 1, new ResourceLocation("forbidden", "textures/misc/consuming.png"))) .setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.CONSUMING.1"), - new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Consuming")) }) - .setParents(new String[] { "INFUSIONENCHANTMENT" }).setSecondary().setConcealed() - .registerResearchItem(); + new ResearchPage("forbidden.research_page.CONSUMING.1"), + new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Consuming"))) + .setParents("INFUSIONENCHANTMENT").setSecondary().setConcealed().registerResearchItem(); (new DarkResearchItem( "EDUCATIONAL", "FORBIDDEN", @@ -133,10 +132,9 @@ public class ForbiddenResearch { 2, new ResourceLocation("forbidden", "textures/misc/educational.png"))) .setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.EDUCATIONAL.1"), - new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Educational")) }) - .setParents(new String[] { "INFUSIONENCHANTMENT" }).setSecondary().setConcealed() - .registerResearchItem(); + new ResearchPage("forbidden.research_page.EDUCATIONAL.1"), + new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Educational"))) + .setParents("INFUSIONENCHANTMENT").setSecondary().setConcealed().registerResearchItem(); } if (Compat.botan || Compat.bm || Compat.am2) (new DarkResearchItem( @@ -146,8 +144,7 @@ public class ForbiddenResearch { -1, 1, 0, - new ItemStack(Blocks.enchanting_table))) - .setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.SCHOOLS.1") }) + new ItemStack(Blocks.enchanting_table))).setPages(new ResearchPage("forbidden.research_page.SCHOOLS.1")) .setRound().setStub().setAutoUnlock().registerResearchItem(); } @@ -161,9 +158,9 @@ public class ForbiddenResearch { 0, new ItemStack(ForbiddenItems.deadlyShards, 1, 0))) .setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.NETHERSHARDS.1"), - new ResearchPage("forbidden.research_page.NETHERSHARDS.2"), - new ResearchPage("forbidden.research_page.NETHERSHARDS.3") }) + new ResearchPage("forbidden.research_page.NETHERSHARDS.1"), + new ResearchPage("forbidden.research_page.NETHERSHARDS.2"), + new ResearchPage("forbidden.research_page.NETHERSHARDS.3")) .setStub().setRound().setAutoUnlock().registerResearchItem(); else(new DarkResearchItem( "NETHERSHARDS", @@ -174,9 +171,9 @@ public class ForbiddenResearch { 0, new ItemStack(ForbiddenItems.deadlyShards, 1, 0))) .setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.NETHERSHARDS.1"), - new ResearchPage("forbidden.research_page.NETHERSHARDS.2b"), - new ResearchPage("forbidden.research_page.NETHERSHARDS.3") }) + new ResearchPage("forbidden.research_page.NETHERSHARDS.1"), + new ResearchPage("forbidden.research_page.NETHERSHARDS.2b"), + new ResearchPage("forbidden.research_page.NETHERSHARDS.3")) .setStub().setRound().setAutoUnlock().registerResearchItem(); (new DarkResearchItem( @@ -186,11 +183,9 @@ public class ForbiddenResearch { -8, -8, 1, - new ItemStack(Blocks.fire))) - .setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.HELLFIRE.1") }) - .setRound().registerResearchItem().setHidden() - .setAspectTriggers(new Aspect[] { DarkAspects.NETHER }) - .setParents(new String[] { "NETHERSHARDS" }); + new ItemStack(Blocks.fire))).setPages(new ResearchPage("forbidden.research_page.HELLFIRE.1")).setRound() + .registerResearchItem().setHidden().setAspectTriggers(DarkAspects.NETHER) + .setParents("NETHERSHARDS"); (new DarkResearchItem( "ROD_profane", "FORBIDDEN", @@ -199,9 +194,8 @@ public class ForbiddenResearch { -8, 0, new ItemStack(ForbiddenItems.wandCore, 1, 5))) - .setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.ROD_profane.1") }) - .setRound().registerResearchItem().setHidden().setParents(new String[] { "NETHERSHARDS" }) - .setStub(); + .setPages(new ResearchPage("forbidden.research_page.ROD_profane.1")).setRound() + .registerResearchItem().setHidden().setParents("NETHERSHARDS").setStub(); if (!Config.noLust) (new DarkResearchItem( "SUBCOLLAR", "FORBIDDEN", @@ -212,10 +206,10 @@ public class ForbiddenResearch { 2, new ItemStack(ForbiddenItems.subCollar))) .setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.SUBCOLLAR.1"), - new ResearchPage((InfusionRecipe) recipes.get("SubCollar")) }) - .setParents(new String[] { "NETHERSHARDS", "VISAMULET", "INFUSION" }).setHidden() - .setAspectTriggers(new Aspect[] { DarkAspects.LUST }).registerResearchItem(); + new ResearchPage("forbidden.research_page.SUBCOLLAR.1"), + new ResearchPage((InfusionRecipe) recipes.get("SubCollar"))) + .setParents("NETHERSHARDS", "VISAMULET", "INFUSION").setHidden() + .setAspectTriggers(DarkAspects.LUST).registerResearchItem(); (new DarkResearchItem( "SKULLAXE", @@ -226,10 +220,9 @@ public class ForbiddenResearch { 2, new ItemStack(ForbiddenItems.skullAxe))) .setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.SKULLAXE.1"), - new ResearchPage((InfusionRecipe) recipes.get("SkullAxe")) }) - .setParents(new String[] { "NETHERSHARDS", "THAUMIUM", "INFUSION" }).setConcealed() - .registerResearchItem(); + new ResearchPage("forbidden.research_page.SKULLAXE.1"), + new ResearchPage((InfusionRecipe) recipes.get("SkullAxe"))) + .setParents("NETHERSHARDS", "THAUMIUM", "INFUSION").setConcealed().registerResearchItem(); ThaumcraftApi.addWarpToResearch("SKULLAXE", 1); if (Config.gluttony != 1) { (new DarkResearchItem( @@ -241,9 +234,9 @@ public class ForbiddenResearch { 2, new ItemStack(ForbiddenItems.ringFood))) .setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.RINGFOOD.1"), - new ResearchPage((IArcaneRecipe) recipes.get("RingFood")) }) - .setParents(new String[] { "NETHERSHARDS" }).registerResearchItem(); + new ResearchPage("forbidden.research_page.RINGFOOD.1"), + new ResearchPage((IArcaneRecipe) recipes.get("RingFood"))) + .setParents("NETHERSHARDS").registerResearchItem(); (new DarkResearchItem( "ARCANECAKE", "FORBIDDEN", @@ -253,11 +246,10 @@ public class ForbiddenResearch { 2, new ItemStack(ForbiddenItems.arcaneCakeItem))) .setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.ARCANECAKE.1"), - new ResearchPage((InfusionRecipe) recipes.get("ArcaneCake")) }) - .setParents(new String[] { "NETHERSHARDS", "INFUSION" }) - .setAspectTriggers(new Aspect[] { DarkAspects.GLUTTONY }).setConcealed() - .registerResearchItem(); + new ResearchPage("forbidden.research_page.ARCANECAKE.1"), + new ResearchPage((InfusionRecipe) recipes.get("ArcaneCake"))) + .setParents("NETHERSHARDS", "INFUSION").setAspectTriggers(DarkAspects.GLUTTONY) + .setConcealed().registerResearchItem(); } (new DarkResearchItem( "FOCUSBLINK", @@ -269,9 +261,9 @@ public class ForbiddenResearch { 2, new ItemStack(ForbiddenItems.blinkFocus))) .setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.FOCUSBLINK.1"), - new ResearchPage((InfusionRecipe) recipes.get("FocusBlink")) }) - .setConcealed().setParents(new String[] { "NETHERSHARDS", "INFUSION" }).registerResearchItem(); + new ResearchPage("forbidden.research_page.FOCUSBLINK.1"), + new ResearchPage((InfusionRecipe) recipes.get("FocusBlink"))) + .setConcealed().setParents("NETHERSHARDS", "INFUSION").registerResearchItem(); (new DarkResearchItem( "MORPHTOOLS", "FORBIDDEN", @@ -281,13 +273,13 @@ public class ForbiddenResearch { 4, new ItemStack(ForbiddenItems.morphPickaxe))) .setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.MORPHTOOLS.1"), - new ResearchPage((InfusionRecipe) recipes.get("MorphPick")), - new ResearchPage((InfusionRecipe) recipes.get("MorphSword")), - new ResearchPage((InfusionRecipe) recipes.get("MorphShovel")), - new ResearchPage((InfusionRecipe) recipes.get("MorphAxe")) }) - .setParentsHidden(new String[] { "THAUMIUM", "INFUSIONENCHANTMENT" }) - .setParents(new String[] { "NETHERSHARDS" }).setConcealed().registerResearchItem(); + new ResearchPage("forbidden.research_page.MORPHTOOLS.1"), + new ResearchPage((InfusionRecipe) recipes.get("MorphPick")), + new ResearchPage((InfusionRecipe) recipes.get("MorphSword")), + new ResearchPage((InfusionRecipe) recipes.get("MorphShovel")), + new ResearchPage((InfusionRecipe) recipes.get("MorphAxe"))) + .setParentsHidden("THAUMIUM", "INFUSIONENCHANTMENT").setParents("NETHERSHARDS").setConcealed() + .registerResearchItem(); ThaumcraftApi.addWarpToResearch("MORPHTOOLS", 4); (new DarkResearchItem( "ROD_infernal", @@ -298,14 +290,12 @@ public class ForbiddenResearch { 3, new ItemStack(ForbiddenItems.wandCore, 1, 1))) .setPages( - new ResearchPage[] { - new FormattedResearchPage( - "forbidden.research_page.ROD_infernal.1", - new Integer[] { Config.infernalCoreCap }), - new ResearchPage((InfusionRecipe) recipes.get("WandRodInfernal")), - new ResearchPage("forbidden.research_page.ROD_infernal.2") }) - .setParents(new String[] { "ROD_silverwood", "INFUSION", "NETHERSHARDS" }).setConcealed() - .registerResearchItem(); + new FormattedResearchPage( + "forbidden.research_page.ROD_infernal.1", + new Integer[] { Config.infernalCoreCap }), + new ResearchPage((InfusionRecipe) recipes.get("WandRodInfernal")), + new ResearchPage("forbidden.research_page.ROD_infernal.2")) + .setParents("ROD_silverwood", "INFUSION", "NETHERSHARDS").setConcealed().registerResearchItem(); ThaumcraftApi.addWarpToResearch("ROD_infernal", 2); if (Config.enchanting) { @@ -318,10 +308,9 @@ public class ForbiddenResearch { 4, new ResourceLocation("forbidden", "textures/misc/wrath.png"))) .setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.WRATH.1"), - new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Wrath")) }) - .setParents(new String[] { "NETHERSHARDS", "INFUSIONENCHANTMENT" }).setConcealed() - .registerResearchItem(); + new ResearchPage("forbidden.research_page.WRATH.1"), + new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Wrath"))) + .setParents("NETHERSHARDS", "INFUSIONENCHANTMENT").setConcealed().registerResearchItem(); ThaumcraftApi.addWarpToResearch("WRATH", 3); if (Config.greedyEnch) (new DarkResearchItem( "GREEDY", @@ -332,10 +321,9 @@ public class ForbiddenResearch { 2, new ResourceLocation("forbidden", "textures/misc/greedy.png"))) .setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.GREEDY.1"), - new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Greedy")) }) - .setParents(new String[] { "NETHERSHARDS", "INFUSIONENCHANTMENT" }).setConcealed() - .registerResearchItem(); + new ResearchPage("forbidden.research_page.GREEDY.1"), + new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Greedy"))) + .setParents("NETHERSHARDS", "INFUSIONENCHANTMENT").setConcealed().registerResearchItem(); (new DarkResearchItem( "CORRUPTING", "FORBIDDEN", @@ -345,10 +333,9 @@ public class ForbiddenResearch { 1, new ResourceLocation("forbidden", "textures/misc/corrupting.png"))) .setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.CORRUPTING.1"), - new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Corrupting")) }) - .setParents(new String[] { "NETHERSHARDS", "INFUSIONENCHANTMENT" }).setConcealed() - .registerResearchItem(); + new ResearchPage("forbidden.research_page.CORRUPTING.1"), + new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Corrupting"))) + .setParents("NETHERSHARDS", "INFUSIONENCHANTMENT").setConcealed().registerResearchItem(); (new DarkResearchItem( "CLUSTER", @@ -359,9 +346,9 @@ public class ForbiddenResearch { 3, new ResourceLocation("forbidden", "textures/misc/lucrative.png"))) .setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.CLUSTER.1"), - new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Cluster")) }) - .setParents(new String[] { "MORPHTOOLS", "ELEMENTALPICK" }).setSecondary().setConcealed() + new ResearchPage("forbidden.research_page.CLUSTER.1"), + new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Cluster"))) + .setParents("MORPHTOOLS", "ELEMENTALPICK").setSecondary().setConcealed() .registerResearchItem(); (new DarkResearchItem( "IMPACT", @@ -373,10 +360,9 @@ public class ForbiddenResearch { 3, new ResourceLocation("forbidden", "textures/misc/impact.png"))) .setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.IMPACT.1"), - new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Impact")) }) - .setParents(new String[] { "MORPHTOOLS", "ELEMENTALSHOVEL" }).setConcealed() - .registerResearchItem(); + new ResearchPage("forbidden.research_page.IMPACT.1"), + new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Impact"))) + .setParents("MORPHTOOLS", "ELEMENTALSHOVEL").setConcealed().registerResearchItem(); (new DarkResearchItem( "VOIDTOUCHED", "FORBIDDEN", @@ -387,10 +373,9 @@ public class ForbiddenResearch { 4, new ResourceLocation("forbidden", "textures/misc/voidtouched.png"))) .setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.VOIDTOUCHED.1"), - new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Voidtouched")) }) - .setParents(new String[] { "MORPHTOOLS", "VOIDMETAL" }).setConcealed() - .registerResearchItem(); + new ResearchPage("forbidden.research_page.VOIDTOUCHED.1"), + new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Voidtouched"))) + .setParents("MORPHTOOLS", "VOIDMETAL").setConcealed().registerResearchItem(); ThaumcraftApi.addWarpToResearch("VOIDTOUCHED", 3); } @@ -404,11 +389,11 @@ public class ForbiddenResearch { 0, new ItemStack(ForbiddenItems.fork))) .setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.FORK.1"), - new ResearchPage((InfusionRecipe) recipes.get("Fork")), - new ResearchPage("WRATHCAGE", "forbidden.research_page.FORK.wc") }) - .setParents(new String[] { "INFUSION", "NETHERSHARDS", "THAUMIUM" }).setSecondary() - .setConcealed().registerResearchItem(); + new ResearchPage("forbidden.research_page.FORK.1"), + new ResearchPage((InfusionRecipe) recipes.get("Fork")), + new ResearchPage("WRATHCAGE", "forbidden.research_page.FORK.wc")) + .setParents("INFUSION", "NETHERSHARDS", "THAUMIUM").setSecondary().setConcealed() + .registerResearchItem(); if (Config.wrathCost > 0) (new DarkResearchItem( "WRATHCAGE", "FORBIDDEN", @@ -418,14 +403,13 @@ public class ForbiddenResearch { 4, new ItemStack(ForbiddenBlocks.wrathCage))) .setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.WRATHCAGE.1"), - new ResearchPage((InfusionRecipe) recipes.get("WrathCage")), - new ResearchPage("forbidden.research_page.WRATHCAGE.2"), - new ResearchPage("forbidden.research_page.WRATHCAGE.3"), - new ResearchPage((CrucibleRecipe) recipes.get("MobCrystal")) }) - .setParents(new String[] { "FORK" }) - .setParentsHidden(new String[] { "INFUSION", "THAUMIUM", "DISTILESSENTIA" }).setConcealed() - .registerResearchItem(); + new ResearchPage("forbidden.research_page.WRATHCAGE.1"), + new ResearchPage((InfusionRecipe) recipes.get("WrathCage")), + new ResearchPage("forbidden.research_page.WRATHCAGE.2"), + new ResearchPage("forbidden.research_page.WRATHCAGE.3"), + new ResearchPage((CrucibleRecipe) recipes.get("MobCrystal"))) + .setParents("FORK").setParentsHidden("INFUSION", "THAUMIUM", "DISTILESSENTIA") + .setConcealed().registerResearchItem(); else(new DarkResearchItem( "WRATHCAGE", "FORBIDDEN", @@ -435,13 +419,12 @@ public class ForbiddenResearch { 4, new ItemStack(ForbiddenBlocks.wrathCage))) .setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.WRATHCAGE.1"), - new ResearchPage((InfusionRecipe) recipes.get("WrathCage")), - new ResearchPage("forbidden.research_page.WRATHCAGE.3"), - new ResearchPage((CrucibleRecipe) recipes.get("MobCrystal")) }) - .setParents(new String[] { "FORK" }) - .setParentsHidden(new String[] { "INFUSION", "THAUMIUM", "DISTILESSENTIA" }).setConcealed() - .registerResearchItem(); + new ResearchPage("forbidden.research_page.WRATHCAGE.1"), + new ResearchPage((InfusionRecipe) recipes.get("WrathCage")), + new ResearchPage("forbidden.research_page.WRATHCAGE.3"), + new ResearchPage((CrucibleRecipe) recipes.get("MobCrystal"))) + .setParents("FORK").setParentsHidden("INFUSION", "THAUMIUM", "DISTILESSENTIA") + .setConcealed().registerResearchItem(); ThaumcraftApi.addWarpToResearch("WRATHCAGE", 3); ThaumcraftApi.addWarpToItem(new ItemStack(ForbiddenBlocks.wrathCage, 1), 5); } @@ -457,11 +440,10 @@ public class ForbiddenResearch { 2, new ItemStack(ForbiddenItems.taintShovel))) .setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.TAINTSHOVEL.1"), - new ResearchPage((InfusionRecipe) recipes.get("TaintShovel")), - new ResearchPage("forbidden.research_page.TAINTSHOVEL.2") }) - .setParents(new String[] { "THAUMIUM", "INFUSION", "ETHEREALBLOOM" }).setConcealed() - .registerResearchItem(); + new ResearchPage("forbidden.research_page.TAINTSHOVEL.1"), + new ResearchPage((InfusionRecipe) recipes.get("TaintShovel")), + new ResearchPage("forbidden.research_page.TAINTSHOVEL.2")) + .setParents("THAUMIUM", "INFUSION", "ETHEREALBLOOM").setConcealed().registerResearchItem(); (new DarkResearchItem( "TAINTPICK", "FORBIDDEN", @@ -471,9 +453,9 @@ public class ForbiddenResearch { 2, new ItemStack(ForbiddenItems.taintPickaxe))) .setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.TAINTPICK.1"), - new ResearchPage((InfusionRecipe) recipes.get("TaintPick")) }) - .setParents(new String[] { "THAUMIUM", "INFUSION" }).setConcealed().registerResearchItem(); + new ResearchPage("forbidden.research_page.TAINTPICK.1"), + new ResearchPage((InfusionRecipe) recipes.get("TaintPick"))) + .setParents("THAUMIUM", "INFUSION").setConcealed().registerResearchItem(); (new DarkResearchItem( "ROD_tainted", "FORBIDDEN", @@ -483,13 +465,11 @@ public class ForbiddenResearch { 3, new ItemStack(ForbiddenItems.wandCore, 1, 0))) .setPages( - new ResearchPage[] { - new FormattedResearchPage( - "forbidden.research_page.ROD_tainted.1", - new Integer[] { Config.taintedCoreCap }), - new ResearchPage((InfusionRecipe) recipes.get("WandRodTainted")) }) - .setParents(new String[] { "ROD_silverwood", "TAINTSHOVEL", "INFUSION" }).setConcealed() - .registerResearchItem(); + new FormattedResearchPage( + "forbidden.research_page.ROD_tainted.1", + new Integer[] { Config.taintedCoreCap }), + new ResearchPage((InfusionRecipe) recipes.get("WandRodTainted"))) + .setParents("ROD_silverwood", "TAINTSHOVEL", "INFUSION").setConcealed().registerResearchItem(); (new DarkResearchItem( "TAINTTREE", "FORBIDDEN", @@ -499,12 +479,11 @@ public class ForbiddenResearch { 3, new ItemStack(ForbiddenBlocks.taintSapling))) .setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.TAINTTREE.1"), - new ResearchPage((CrucibleRecipe) recipes.get("TaintTree")), - new ResearchPage((IRecipe) recipes.get("TaintPlank")), - new ResearchPage(new ItemStack(ForbiddenBlocks.taintLog, 1, 0)) }) - .setParents(new String[] { "THAUMIUM", "INFUSION", "ETHEREALBLOOM" }).setConcealed() - .registerResearchItem(); + new ResearchPage("forbidden.research_page.TAINTTREE.1"), + new ResearchPage((CrucibleRecipe) recipes.get("TaintTree")), + new ResearchPage((IRecipe) recipes.get("TaintPlank")), + new ResearchPage(new ItemStack(ForbiddenBlocks.taintLog, 1, 0))) + .setParents("THAUMIUM", "INFUSION", "ETHEREALBLOOM").setConcealed().registerResearchItem(); ThaumcraftApi.addWarpToResearch("TAINTTREE", 1); ThaumcraftApi.addWarpToItem(new ItemStack(ForbiddenBlocks.taintSapling, 1, 0), 1); (new DarkResearchItem( @@ -516,11 +495,10 @@ public class ForbiddenResearch { 2, new ItemStack(ForbiddenBlocks.taintStone, 1, 1))) .setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.TAINTSTONE.1"), - new ResearchPage((IArcaneRecipe) recipes.get("TaintStone")), - new ResearchPage((IRecipe) recipes.get("TaintBrick")) }) - .setParents(new String[] { "THAUMIUM", "INFUSION", "ETHEREALBLOOM" }).setConcealed() - .registerResearchItem(); + new ResearchPage("forbidden.research_page.TAINTSTONE.1"), + new ResearchPage((IArcaneRecipe) recipes.get("TaintStone")), + new ResearchPage((IRecipe) recipes.get("TaintBrick"))) + .setParents("THAUMIUM", "INFUSION", "ETHEREALBLOOM").setConcealed().registerResearchItem(); ThaumcraftApi.addWarpToResearch("ROD_tainted", 2); } } diff --git a/src/main/java/fox/spiteful/forbidden/compat/BloodMagic.java b/src/main/java/fox/spiteful/forbidden/compat/BloodMagic.java index ad18204..e515ad8 100644 --- a/src/main/java/fox/spiteful/forbidden/compat/BloodMagic.java +++ b/src/main/java/fox/spiteful/forbidden/compat/BloodMagic.java @@ -60,9 +60,8 @@ public class BloodMagic { -1, 0, new ResourceLocation("alchemicalwizardry", "textures/items/SacrificialDagger.png"))) - .setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.BLOODMAGIC.1") }) - .setParents(new String[] { "SCHOOLS" }).setRound().setStub().setAutoUnlock() - .registerResearchItem(); + .setPages(new ResearchPage("forbidden.research_page.BLOODMAGIC.1")).setParents("SCHOOLS") + .setRound().setStub().setAutoUnlock().registerResearchItem(); if (Config.crossWand) { @@ -93,14 +92,14 @@ public class BloodMagic { -1, -3, 3, - new ItemStack(ForbiddenItems.wandCore, 1, 3))).setPages( - new ResearchPage[] { + new ItemStack(ForbiddenItems.wandCore, 1, 3))) + .setPages( new FormattedResearchPage( "forbidden.research_page.ROD_blood.1", new Integer[] { Config.bloodCoreCap }), new ResearchPage(blood_recipe), - new ResearchPage("forbidden.research_page.ROD_blood.2") }) - .setParents(new String[] { "ROD_silverwood", "INFUSION", "BLOODMAGIC" }).setConcealed() + new ResearchPage("forbidden.research_page.ROD_blood.2")) + .setParents("ROD_silverwood", "INFUSION", "BLOODMAGIC").setConcealed() .registerResearchItem(); ThaumcraftApi.addWarpToResearch("ROD_blood", 2); @@ -109,9 +108,13 @@ public class BloodMagic { new ItemStack(ForbiddenItems.wandCore, 1, 9), (new AspectList()).add(Aspect.ENTROPY, 26).add(Aspect.FIRE, 26).add(Aspect.WATER, 26) .add(Aspect.AIR, 26).add(Aspect.EARTH, 26).add(Aspect.ORDER, 26), - new Object[] { "__D", "_B_", "B__", Character.valueOf('B'), - new ItemStack(ForbiddenItems.wandCore, 1, 3), Character.valueOf('D'), - new ItemStack(demonShard) }); + "__D", + "_B_", + "B__", + 'B', + new ItemStack(ForbiddenItems.wandCore, 1, 3), + Character.valueOf('D'), + new ItemStack(demonShard)); (new DarkResearchItem( "ROD_blood_staff", "FORBIDDEN", @@ -122,13 +125,12 @@ public class BloodMagic { 2, new ItemStack(ForbiddenItems.wandCore, 1, 9))) .setPages( - new ResearchPage[] { - new FormattedResearchPage( - "forbidden.research_page.ROD_blood_staff.1", - new Integer[] { Config.bloodStaffCap }), - new ResearchPage(blood_staff) }) - .setParents(new String[] { "ROD_silverwood_staff", "ROD_blood" }).setSpecial() - .setConcealed().registerResearchItem(); + new FormattedResearchPage( + "forbidden.research_page.ROD_blood_staff.1", + new Integer[] { Config.bloodStaffCap }), + new ResearchPage(blood_staff)) + .setParents("ROD_silverwood_staff", "ROD_blood").setSpecial().setConcealed() + .registerResearchItem(); InfusionRecipe alchemical_recipe = ThaumcraftApi.addInfusionCraftingRecipe( "CAP_alchemical", @@ -148,13 +150,12 @@ public class BloodMagic { 2, new ItemStack(ForbiddenItems.wandCap, 1, 0))) .setPages( - new ResearchPage[] { - new FormattedResearchPage( - "forbidden.research_page.CAP_alchemical.1", - new Double[] { Config.alchemicalDiscount * 100 - 10, - Config.alchemicalDiscount * 100 }), - new ResearchPage(alchemical_recipe) }) - .setParents(new String[] { "ROD_blood", "CAP_gold" }).setSecondary().setConcealed() + new FormattedResearchPage( + "forbidden.research_page.CAP_alchemical.1", + new Double[] { Config.alchemicalDiscount * 100 - 10, + Config.alchemicalDiscount * 100 }), + new ResearchPage(alchemical_recipe)) + .setParents("ROD_blood", "CAP_gold").setSecondary().setConcealed() .registerResearchItem(); } @@ -162,8 +163,10 @@ public class BloodMagic { "BLOODWELL", new ItemStack(ForbiddenItems.bloodwell, 1, 0), (new AspectList()).add(Aspect.WATER, 10).add(Aspect.EARTH, 10), - new Object[] { new ItemStack(Items.feather, 1, 0), new ItemStack(bloodBucket, 1, 0), - new ItemStack(Items.glass_bottle, 1, 0), new ItemStack(crapOrb, 1, 0) }); + new ItemStack(Items.feather, 1, 0), + new ItemStack(bloodBucket, 1, 0), + new ItemStack(Items.glass_bottle, 1, 0), + new ItemStack(crapOrb, 1, 0)); (new DarkResearchItem( "BLOODWELL", "FORBIDDEN", @@ -174,9 +177,9 @@ public class BloodMagic { 1, new ItemStack(ForbiddenItems.bloodwell, 1, 0))) .setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.BLOODWELL.1"), - new ResearchPage(bloodwell_recipe) }) - .setParents(new String[] { "BLOODMAGIC" }).registerResearchItem(); + new ResearchPage("forbidden.research_page.BLOODWELL.1"), + new ResearchPage(bloodwell_recipe)) + .setParents("BLOODMAGIC").registerResearchItem(); InfusionRecipe blood_rapier = ThaumcraftApi.addInfusionCraftingRecipe( "BLOODRAPIER", @@ -199,10 +202,9 @@ public class BloodMagic { 3, new ItemStack(ForbiddenItems.bloodRapier, 1, 0))) .setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.BLOODRAPIER.1"), - new ResearchPage(blood_rapier) }) - .setParents(new String[] { "BLOODMAGIC", "INFUSION", "VOIDMETAL" }).setConcealed() - .registerResearchItem(); + new ResearchPage("forbidden.research_page.BLOODRAPIER.1"), + new ResearchPage(blood_rapier)) + .setParents("BLOODMAGIC", "INFUSION", "VOIDMETAL").setConcealed().registerResearchItem(); ThaumcraftApi.addWarpToResearch("BLOODRAPIER", 2); ThaumcraftApi.addWarpToItem(new ItemStack(ForbiddenItems.bloodRapier), 2); @@ -231,10 +233,10 @@ public class BloodMagic { 4, new ItemStack(ForbiddenItems.bloodOrb, 1, 0))) .setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.ELDRITCHORB.1"), - new ResearchPage(eldritch_orb) }) - .setParents(new String[] { "BLOODMAGIC", "INFUSION", "PRIMPEARL", "VOIDMETAL" }) - .setConcealed().setSpecial().registerResearchItem(); + new ResearchPage("forbidden.research_page.ELDRITCHORB.1"), + new ResearchPage(eldritch_orb)) + .setParents("BLOODMAGIC", "INFUSION", "PRIMPEARL", "VOIDMETAL").setConcealed().setSpecial() + .registerResearchItem(); ThaumcraftApi.addWarpToResearch("ELDRITCHORB", 3); ThaumcraftApi.addWarpToItem(new ItemStack(ForbiddenItems.bloodOrb), 5); diff --git a/src/main/java/fox/spiteful/forbidden/compat/ForbiddenBotany.java b/src/main/java/fox/spiteful/forbidden/compat/ForbiddenBotany.java index f0079b9..c5fd865 100644 --- a/src/main/java/fox/spiteful/forbidden/compat/ForbiddenBotany.java +++ b/src/main/java/fox/spiteful/forbidden/compat/ForbiddenBotany.java @@ -48,36 +48,45 @@ public class ForbiddenBotany { Item lexicon = Compat.getItem("Botania", "lexicon"); try { - Class stupidLib = Class.forName("vazkii.botania.common.lib.LibOreDict"); + Class stupidLib = Class.forName("vazkii.botania.common.lib.LibOreDict"); Field nugget = stupidLib.getDeclaredField("MANASTEEL_NUGGET"); } catch (Exception e) { - e.printStackTrace(); - LogHandler.log(Level.INFO, "Somebody's using an outdated version of Botania."); + LogHandler.log(Level.INFO, e, "Somebody's using an outdated version of Botania."); CraftingManager.getInstance().addRecipe( new ItemStack(resource, 1, 0), - new Object[] { "###", "###", "###", Character.valueOf('#'), - new ItemStack(ForbiddenItems.resource, 1, 2) }); + "###", + "###", + "###", + '#', + new ItemStack(ForbiddenItems.resource, 1, 2)); CraftingManager.getInstance().addRecipe( new ItemStack(ForbiddenItems.resource, 9, 2), - new Object[] { "#", Character.valueOf('#'), new ItemStack(resource, 1, 0) }); + "#", + '#', + new ItemStack(resource, 1, 0)); CraftingManager.getInstance().addRecipe( new ItemStack(resource, 1, 7), - new Object[] { "###", "###", "###", Character.valueOf('#'), - new ItemStack(ForbiddenItems.resource, 1, 4) }); + "###", + "###", + "###", + '#', + new ItemStack(ForbiddenItems.resource, 1, 4)); CraftingManager.getInstance().addRecipe( new ItemStack(ForbiddenItems.resource, 9, 4), - new Object[] { "#", Character.valueOf('#'), new ItemStack(resource, 1, 7) }); + "#", + '#', + new ItemStack(resource, 1, 7)); } OreDictionary.registerOre("nuggetManasteel", new ItemStack(ForbiddenItems.resource, 1, 2)); OreDictionary.registerOre("nuggetElvenElementium", new ItemStack(ForbiddenItems.resource, 1, 4)); (new DarkResearchItem("BOTANY", "FORBIDDEN", "[B]", new AspectList(), -3, 3, 0, new ItemStack(lexicon))) - .setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.BOTANY.1") }) - .setParents(new String[] { "SCHOOLS" }).setRound().setStub().setAutoUnlock().registerResearchItem(); + .setPages(new ResearchPage("forbidden.research_page.BOTANY.1")).setParents("SCHOOLS").setRound() + .setStub().setAutoUnlock().registerResearchItem(); if (Config.crossWand) { @@ -100,10 +109,11 @@ public class ForbiddenBotany { -1, 3, 3, - new ItemStack(ForbiddenItems.wandCore, 1, 7))).setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.ROD_livingwood.1"), - new ResearchPage(livingwood_rod) }) - .setParents(new String[] { "BOTANY", "ROD_silverwood", "INFUSION" }).setConcealed() + new ItemStack(ForbiddenItems.wandCore, 1, 7))) + .setPages( + new ResearchPage("forbidden.research_page.ROD_livingwood.1"), + new ResearchPage(livingwood_rod)) + .setParents("BOTANY", "ROD_silverwood", "INFUSION").setConcealed() .registerResearchItem(); ThaumcraftApi.addWarpToResearch("ROD_livingwood", 2); BotaniaAPI.registerManaInfusionRecipe( @@ -116,7 +126,10 @@ public class ForbiddenBotany { new ItemStack(ForbiddenItems.wandCap, 1, 4), (new AspectList()).add(Aspect.ENTROPY, 6).add(Aspect.FIRE, 6).add(Aspect.WATER, 6) .add(Aspect.AIR, 6).add(Aspect.EARTH, 6).add(Aspect.ORDER, 6), - new Object[] { "NNN", "N N", Character.valueOf('N'), "nuggetManasteel" }); + "NNN", + "N N", + 'N', + "nuggetManasteel"); (new DarkResearchItem( "CAP_manasteel", "FORBIDDEN", @@ -127,13 +140,11 @@ public class ForbiddenBotany { 2, new ItemStack(ForbiddenItems.wandCap, 1, 3))) .setPages( - new ResearchPage[] { - new FormattedResearchPage( - "forbidden.research_page.CAP_manasteel.1", - new Double[] { Config.manasteelDiscount * 100 }), - new ResearchPage(manasteel_cap) }) - .setParents(new String[] { "ROD_livingwood" }).setSecondary().setConcealed() - .registerResearchItem(); + new FormattedResearchPage( + "forbidden.research_page.CAP_manasteel.1", + new Double[] { Config.manasteelDiscount * 100 }), + new ResearchPage(manasteel_cap)) + .setParents("ROD_livingwood").setSecondary().setConcealed().registerResearchItem(); BotaniaAPI.registerManaInfusionRecipe( new ItemStack(ForbiddenItems.wandCap, 1, 3), new ItemStack(ForbiddenItems.wandCap, 1, 4), @@ -155,9 +166,13 @@ public class ForbiddenBotany { new ItemStack(ForbiddenItems.wandCore, 1, 13), (new AspectList()).add(Aspect.ENTROPY, 26).add(Aspect.FIRE, 26).add(Aspect.WATER, 26) .add(Aspect.AIR, 26).add(Aspect.EARTH, 26).add(Aspect.ORDER, 26), - new Object[] { "__D", "_B_", "B__", Character.valueOf('B'), - new ItemStack(ForbiddenItems.wandCore, 1, 11), Character.valueOf('D'), - new ItemStack(resource, 1, 9) }); + "__D", + "_B_", + "B__", + 'B', + new ItemStack(ForbiddenItems.wandCore, 1, 11), + 'D', + new ItemStack(resource, 1, 9)); BotaniaAPI.registerManaInfusionRecipe( new ItemStack(ForbiddenItems.wandCore, 1, 11), new ItemStack(ForbiddenItems.wandCore, 1, 12), @@ -170,11 +185,13 @@ public class ForbiddenBotany { 1, 3, 2, - new ItemStack(ForbiddenItems.wandCore, 1, 13))).setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.ROD_dreamwood_staff.1"), - new ResearchPage(dreamwood_staff), new ResearchPage(dreamwood_rod) }) - .setParents(new String[] { "ROD_livingwood", "ROD_silverwood_staff" }) - .setSiblings(new String[] { "ROD_dreamwood" }).setConcealed().registerResearchItem(); + new ItemStack(ForbiddenItems.wandCore, 1, 13))) + .setPages( + new ResearchPage("forbidden.research_page.ROD_dreamwood_staff.1"), + new ResearchPage(dreamwood_staff), + new ResearchPage(dreamwood_rod)) + .setParents("ROD_livingwood", "ROD_silverwood_staff").setSiblings("ROD_dreamwood") + .setConcealed().registerResearchItem(); (new DarkResearchItem("ROD_dreamwood", "FORBIDDEN")).setVirtual().registerResearchItem(); IArcaneRecipe elementium_cap_inert = ThaumcraftApi.addArcaneCraftingRecipe( @@ -182,7 +199,10 @@ public class ForbiddenBotany { new ItemStack(ForbiddenItems.wandCap, 1, 6), (new AspectList()).add(Aspect.ENTROPY, 27).add(Aspect.FIRE, 27).add(Aspect.WATER, 27) .add(Aspect.AIR, 27).add(Aspect.EARTH, 27).add(Aspect.ORDER, 27), - new Object[] { "NNN", "N N", Character.valueOf('N'), "nuggetElvenElementium" }); + "NNN", + "N N", + 'N', + "nuggetElvenElementium"); InfusionRecipe elementium_cap = ThaumcraftApi.addInfusionCraftingRecipe( "CAP_elementium", new ItemStack(ForbiddenItems.wandCap, 1, 5), @@ -201,18 +221,21 @@ public class ForbiddenBotany { 3, 3, 4, - new ItemStack(ForbiddenItems.wandCap, 1, 5))).setPages( - new ResearchPage[] { + new ItemStack(ForbiddenItems.wandCap, 1, 5))) + .setPages( new FormattedResearchPage( "forbidden.research_page.CAP_elementium.1", new Double[] { Config.elementiumDiscount * 100 }), - new ResearchPage(elementium_cap_inert), new ResearchPage(elementium_cap) }) - .setParents(new String[] { "ROD_dreamwood_staff" }).setConcealed() - .registerResearchItem(); + new ResearchPage(elementium_cap_inert), + new ResearchPage(elementium_cap)) + .setParents("ROD_dreamwood_staff").setConcealed().registerResearchItem(); IRecipe terrasteel_cap = new ShapedOreRecipe( new ItemStack(ForbiddenItems.wandCap, 1, 2), - new Object[] { "NNN", "N N", Character.valueOf('N'), "nuggetTerrasteel" }); + "NNN", + "N N", + 'N', + "nuggetTerrasteel"); CraftingManager.getInstance().getRecipeList().add(terrasteel_cap); (new DarkResearchItem( "CAP_terrasteel", @@ -222,11 +245,11 @@ public class ForbiddenBotany { 3, 2, 1, - new ItemStack(ForbiddenItems.wandCap, 1, 2))).setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.CAP_terrasteel.1"), - new ResearchPage(terrasteel_cap) }) - .setParents(new String[] { "CAP_manasteel" }).setConcealed().setSecondary() - .registerResearchItem(); + new ItemStack(ForbiddenItems.wandCap, 1, 2))) + .setPages( + new ResearchPage("forbidden.research_page.CAP_terrasteel.1"), + new ResearchPage(terrasteel_cap)) + .setParents("CAP_manasteel").setConcealed().setSecondary().registerResearchItem(); } BotaniaAPI.registerSubTile("euclidaisy", SubTileEuclidaisy.class); @@ -259,9 +282,9 @@ public class ForbiddenBotany { 2, euclidaisy)) .setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.EUCLIDAISY.1"), - new ResearchPage(euclid) }) - .setParents(new String[] { "BOTANY", "INFUSION" }).setConcealed().registerResearchItem(); + new ResearchPage("forbidden.research_page.EUCLIDAISY.1"), + new ResearchPage(euclid)) + .setParents("BOTANY", "INFUSION").setConcealed().registerResearchItem(); BotaniaAPI.registerSubTile("whisperweed", SubTileWhisperweed.class); BotaniaAPI.registerSubTileSignature(SubTileWhisperweed.class, new DarkSignature("whisperweed")); @@ -279,7 +302,7 @@ public class ForbiddenBotany { whisperweed, (new AspectList()).add(Aspect.FIRE, 10).add(Aspect.WATER, 10).add(Aspect.EARTH, 10) .add(Aspect.AIR, 10).add(Aspect.ORDER, 10).add(Aspect.ENTROPY, 10), - new ItemStack[] { new ItemStack(Blocks.tallgrass, 1, 1), new ItemStack(resource, 1, 2), + (Object) new ItemStack[] { new ItemStack(Blocks.tallgrass, 1, 1), new ItemStack(resource, 1, 2), new ItemStack(resource, 1, 6), new ItemStack(ConfigItems.itemResource, 1, 9), new ItemStack(petal, 1, 7), new ItemStack(petal, 1, 10), new ItemStack(rune, 1, 14), new ItemStack(ConfigItems.itemResource, 1, 6) }); @@ -293,9 +316,9 @@ public class ForbiddenBotany { 1, whisperweed)) .setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.WHISPERWEED.1"), - new ResearchPage(whispercraft) }) - .setParents(new String[] { "BOTANY" }).setConcealed().registerResearchItem(); + new ResearchPage("forbidden.research_page.WHISPERWEED.1"), + new ResearchPage(whispercraft)) + .setParents("BOTANY").setConcealed().registerResearchItem(); BotaniaAPI.registerSubTile("tainthistle", SubTileTainthistle.class); BotaniaAPI.registerSubTileSignature(SubTileTainthistle.class, new DarkSignature("tainthistle")); @@ -327,9 +350,9 @@ public class ForbiddenBotany { 2, tainthistle)) .setPages( - new ResearchPage[] { new ResearchPage("forbidden.research_page.TAINTHISTLE.1"), - new ResearchPage(thistlecraft) }) - .setParents(new String[] { "BOTANY", "INFUSION" }).setConcealed().registerResearchItem(); + new ResearchPage("forbidden.research_page.TAINTHISTLE.1"), + new ResearchPage(thistlecraft)) + .setParents("BOTANY", "INFUSION").setConcealed().registerResearchItem(); if (Compat.bm) { BotaniaAPI.registerSubTile("bloodthorn", SubTileBloodthorn.class);