From b3faa5a77a1d869c514cc9d0e5ef2e1b1902cbe5 Mon Sep 17 00:00:00 2001 From: Jeremy Diamond Date: Mon, 3 Feb 2014 03:42:23 -0800 Subject: [PATCH] Moving tainted research into Taint tab Tainturgy is still an irritating name. --- assets/forbidden/lang/en_US.lang | 6 ++++ .../forbidden/textures/items/taintfruit.png | Bin 0 -> 348 bytes assets/forbidden/textures/misc/taintorgan.png | Bin 0 -> 1567 bytes .../spiteful/forbidden/ForbiddenResearch.java | 26 +++++++++++++++--- 4 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 assets/forbidden/textures/items/taintfruit.png create mode 100644 assets/forbidden/textures/misc/taintorgan.png diff --git a/assets/forbidden/lang/en_US.lang b/assets/forbidden/lang/en_US.lang index a85b703..0b84e37 100644 --- a/assets/forbidden/lang/en_US.lang +++ b/assets/forbidden/lang/en_US.lang @@ -69,6 +69,7 @@ enchantment.educational=Educational itemGroup.forbidden=Forbidden Magic itemGroup.mobcrystal=Imprinting Crystals tc.research_category.INFERNALISM=Infernalism +tc.research_category.TAINT=Tainted Arts # # Research forbidden.research_name.NETHERSHARDS=Nether Shards @@ -170,4 +171,9 @@ forbidden.research_page.PIGBANE.1=Zombie Pigmen think they're so great. They're forbidden.research_name.EDUCATIONAL=Enchantment: Educational forbidden.research_text.EDUCATIONAL=Get a learn job! forbidden.research_page.EDUCATIONAL.1=You've created an enchantment to infuse a weapon with the very essence of knowledge and learning. Hammering such learning into monsters' heads will result in them dropping more experience than normal, depending on the level of enchantment. +# +forbidden.research_name.TAINTBASICS=Tainted Lands +forbidden.research_text.TAINTBASICS=Deep Purple +forbidden.research_page.TAINTBASICS.1=Sometimes, Thaumaturgy goes horribly wrong. Miracles become twisted calamities and the very landscape twists into hideous forms. Tainted Lands are places infected by the sick runoff of magical workings, flux. Local flora and fauna become warped and mutated into forms hostile to normal life and the very ground of a tainted land infects those who tread upon its pulsing fibres. +forbidden.research_page.TAINTBASICS.2=Tainted Lands can be found naturally in the world, but can also form when a careless Thaumaturge allows flux goo to stagnate for too long. They are recognizable by their telltale purple fibres and bright violet stalks. Left alone, the tainted land will gradually extend its tendrils outwards, infecting more and more of the surrounding land. Dirt becomes thick, pulpy Tainted Soil while trees and other natural materials are slowly covered in fibres and converted into structurally unsound crust which can collapse or melt into flux goo at any moment. # \ No newline at end of file diff --git a/assets/forbidden/textures/items/taintfruit.png b/assets/forbidden/textures/items/taintfruit.png new file mode 100644 index 0000000000000000000000000000000000000000..099be0bef1ed65a9f34df3e9dd4f97e4d329b2b2 GIT binary patch literal 348 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0gN_s>q|KvkzbT^vI!{F4(TLLB^^zS~=|Sx)GWeYU@`=}5gm@AZQUXFoeX`|EGw z_v8MnYfQ_IRvtMZm2VOuV8)PQb!LLfW0wutOeSJ~%%}PMzW-2=Ax*f1^@PBLVn>N3 zj4h_F%?E1)e77hn%yuwSmylt&tiWSDVS%;-SHiYNo`y`7Qw%fG%%9%-uh6qb@<_Ni z=K*;>1?GfVj@u6NFlMrBbksZinl*(vf$d-po21heZij6LL>6bOyH3sOZ#k8K-eT}{^>bP0l+XkK?R0nz literal 0 HcmV?d00001 diff --git a/assets/forbidden/textures/misc/taintorgan.png b/assets/forbidden/textures/misc/taintorgan.png new file mode 100644 index 0000000000000000000000000000000000000000..adbbc0dbe124fa12b3d3ce4ee22277600bcba905 GIT binary patch literal 1567 zcmV+)2H^RLP)N2bPDNB8 zb~7$DE-^7j^FlWO00o;#L_t(oN7YwJPg`dcy^xSXh?zqD>}P`slL}|DfGeU9{a)$)?MyYFClkMHgB04^*nyRFS;!Til-e1*mPn z4xtk2;>v!0?|tXod(S=JXR_IBw3o4`;F9?Nnt+ZBzC`@8Mf`-{zCg$`VUv8{3KZCE zX)i36(!VvW#;~L|8ji$n{?5 zb3Hxf9(ur&w8S^*CVR-kvoy=+=$T*BDuu-N;YjR+Kq3}$A%4*HEdN;mjnEywMYmL3 zr|W!~E^{ljayzy2HM+)?^qe)VYP}NHttt_YKrUYR4)H7EH^ghip9mu_H5=e{D&rZN z!S@j!qcQHMe!fT-6@h7*2BABAjPCnwwj)A9G_eV9I|5SX7a0lNKJ=8GaU*QCmN0%p zq;ZwW#7jhoIv%EBZlM+)paHaDlBZ}&wP6lb8KS#r#dEeN4uXUd>pKxREY{J?08}hWJ!;z}1LS`keD(ysx#? zwpt_*L?VnjkB)js7mR20cRc>QaTt!CC2IYDhPdJv78RlLLh-Cy!gAW=Wz!;RAntlDqy?K z&Zpu}@dQn9;ePj88_)`^gzIQosb5N69DViQd#Y77*31pufGP2kR}wJBXmM53%EUW1 za03ZAal?0Pp9gHmxiqen9aaZBQ=KSl6TntB0XPzR0Putx5n1s=o9<`D4?>vt6nPQn z01X;eYeA3}0tra(ebP5kwUk}TUr+V?FIp!@dZcCJGC zudV4wlIWlbBUFr`6?jvD1!bm1)xFfK#3g3)b^?MU``{>_UlW@%b^;{J5fuz4MAcRR zzOdmDG8yM+IWmEhaJM;{-!K?A`doq@hJvRhb*m9;22eRj3jv2|kWWGrgDAWBgG`U~ zUx-{lo5Z#wR^aFdZj9Dl*y)0LaR7@IMFkT`OYVT#JVI+e!3aJC=ptvw4|7rUEW0ob zQZ;cz5wZ{wlGfB_0bfOID?-u08?(6vf_o}sgYjBWc3XnGK*Vq)Ty&qa zdXrngl5k2bt3{#K1E8yQE(zcs|Lo$W}a`b>lWhMkX$Wk=mF!i$| z!KG9$z@lmakqV_Jw*Vj$Bx)hbCs6$|GM`sf$~x4y-o8Juc5kQ~h8j@|9(bke`Pk|1 zsaD8hLLf7K1jMG)%*&WIQll#KFfz2Kv~Fm`VmSlQevD2YuwxkMaI$eA0U>`efW>CL5ZfHhDPf8>-tLMX zbuHheQlcYir9HWIR|M7xsw0_xxXE_`SqXrE$wbIxbWxWIv0nKUACS?^-#-KJ%pJ8L zTt$>da$+Zaavl^A0TU7~a;cM%oDt+x1bY^3&~>MPe~kz_DMu=Mq$AtQ^u(@JjHxjJ znw z?|SB&z=h0C0k?WS@DIu>EGmcCz&|VE{oDRQ`7a3UYK>jJ9NN$Kx!!XE{{Z!FwN#Ep R!odIl002ovPDHLkV1o1d#EAd^ literal 0 HcmV?d00001 diff --git a/src/com/spiteful/forbidden/ForbiddenResearch.java b/src/com/spiteful/forbidden/ForbiddenResearch.java index 3ea070b..fed38e7 100644 --- a/src/com/spiteful/forbidden/ForbiddenResearch.java +++ b/src/com/spiteful/forbidden/ForbiddenResearch.java @@ -33,10 +33,8 @@ public class ForbiddenResearch public static void addResearch() { addInfernalism(); + addTaint(); - (new DarkResearchItem("TAINTSHOVEL", "ARTIFICE", (new AspectList()).add(Aspect.CRYSTAL, 1).add(Aspect.TAINT, 2).add(Aspect.TOOL, 1), -9, 6, 4, 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")}).setParentsHidden(new String[]{"THAUMIUM", "INFUSION", "ETHEREALBLOOM"}).setConcealed().registerResearchItem(); - (new DarkResearchItem("TAINTPICK", "ARTIFICE", (new AspectList()).add(Aspect.TOOL, 1).add(Aspect.TAINT, 2).add(Aspect.ENTROPY, 1), -9, 3, 3, new ItemStack(ForbiddenItems.taintPickaxe))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.TAINTPICK.1"), new ResearchPage((InfusionRecipe)recipes.get("TaintPick"))}).setParentsHidden(new String[]{"THAUMIUM", "INFUSION"}).setConcealed().registerResearchItem(); - (new DarkResearchItem("ROD_tainted", "THAUMATURGY", (new AspectList()).add(Aspect.MAGIC, 1).add(Aspect.TAINT, 2).add(Aspect.TOOL, 1), -3, 7, 4, new ItemStack(ForbiddenItems.wandCore, 1, 0))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.ROD_tainted.1"), new ResearchPage((InfusionRecipe)recipes.get("WandRodTainted"))}).setParents(new String[]{"ROD_silverwood", "TAINTSHOVEL"}).setConcealed().registerResearchItem(); if(Config.emeraldTrans) (new DarkResearchItem("TRANSEMERALD", "ALCHEMY", (new AspectList()).add(Aspect.CRYSTAL, 1).add(Aspect.EXCHANGE, 1).add(Aspect.GREED, 2), -6, 3, 3, new ItemStack(ForbiddenItems.resource, 1, 0))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.TRANSEMERALD.1"), new ResearchPage((CrucibleRecipe)recipes.get("TransEmerald"))}).setConcealed().setParents(new String[]{"TRANSGOLD"}).registerResearchItem(); (new DarkResearchItem("BLACKFLOWER", "ALCHEMY", (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.SENSES, 1).add(Aspect.DARKNESS, 2), -4, -1, 3, 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"))}).setParents(new String[]{"CRUCIBLE"}).registerResearchItem(); @@ -89,11 +87,31 @@ public class ForbiddenResearch (new DarkResearchItem("FORK", "INFERNALISM", (new AspectList()), -1, 2, 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")}).setStub().setHidden().registerResearchItem(); - if(!Config.noMeddling){ + if(!Config.noMeddling) + { ((ResearchCategoryList)ResearchCategories.researchCategories.get("THAUMATURGY")).research.remove("FOCUSHELLBAT"); (new ResearchItem("FOCUSHELLBAT", "INFERNALISM", (new AspectList()).add(Aspect.TRAVEL, 1).add(DarkAspects.NETHER, 2).add(Aspect.FIRE, 1).add(DarkAspects.WRATH, 1), -8, -1, 4, ItemApi.getItem("itemFocusHellbat", 0))).setPages(new ResearchPage[]{new ResearchPage("tc.research_page.FOCUSHELLBAT.1"), new ResearchPage((InfusionRecipe)recipes.get("FocusHellbat"))}).setConcealed().setParents(new String[]{"FOCUSTRADE", "INFAUXSION"}).registerResearchItem(); ((ResearchCategoryList)ResearchCategories.researchCategories.get("ARTIFICE")).research.remove("INFERNALFURNACE"); (new ResearchItem("INFERNALFURNACE", "INFERNALISM", (new AspectList()).add(Aspect.FIRE, 2).add(DarkAspects.NETHER, 1).add(Aspect.CRAFT, 1).add(Aspect.AURA, 1), -1, -2, 4, new ResourceLocation("thaumcraft", "textures/misc/r_infernalfurnace.png"))).setPages(new ResearchPage[]{new ResearchPage("tc.research_page.INFERNALFURNACE.1"), new ResearchPage((List)recipes.get("InfernalFurnace")), new ResearchPage("tc.research_page.INFERNALFURNACE.2")}).setParents(new String[]{"NITOR", "ALUMENTUM"}).setConcealed().registerResearchItem(); } } + + public static void addTaint() + { + if(!ResearchCategories.researchCategories.containsKey("TAINT")) + { + ResearchCategories.registerCategory("TAINT", new ResourceLocation("forbidden", "textures/misc/taintorgan.png"), new ResourceLocation("thaumcraft", "textures/gui/gui_researchback.png")); + (new DarkResearchItem("TAINTBASICS", "TAINT", new AspectList(), 0, 0, 0, ItemApi.getItem("itemResource", 12))).setPages(new ResearchPage[] {new ResearchPage("forbidden.research_page.TAINTBASICS.1"), new ResearchPage("forbidden.research_page.TAINTBASICS.2")}).setStub().setRound().setAutoUnlock().registerResearchItem(); + if(!Config.noMeddling) + { + ResearchPage[] pages = ResearchCategories.researchCategories.get("ALCHEMY").research.get("ETHEREALBLOOM").getPages(); + ResearchCategories.researchCategories.get("ALCHEMY").research.remove("ETHEREALBLOOM"); + (new ResearchItem("ETHEREALBLOOM", "TAINT", (new AspectList()).add(Aspect.MAGIC, 1).add(Aspect.PLANT, 2).add(Aspect.HEAL, 1).add(Aspect.TAINT, 1), -2, 2, 4, ItemApi.getBlock("blockCustomPlant", 4))).setPages(pages).setConcealed().setParents(new String[]{"CRUCIBLE", "INFUSION"}).registerResearchItem(); + } + } + + (new DarkResearchItem("TAINTSHOVEL", "TAINT", (new AspectList()).add(Aspect.CRYSTAL, 1).add(Aspect.TAINT, 2).add(Aspect.TOOL, 1), 0, -3, 4, 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")}).setParentsHidden(new String[]{"THAUMIUM", "INFUSION", "ETHEREALBLOOM"}).setConcealed().registerResearchItem(); + (new DarkResearchItem("TAINTPICK", "TAINT", (new AspectList()).add(Aspect.TOOL, 1).add(Aspect.TAINT, 2).add(Aspect.ENTROPY, 1), -2, -3, 3, new ItemStack(ForbiddenItems.taintPickaxe))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.TAINTPICK.1"), new ResearchPage((InfusionRecipe)recipes.get("TaintPick"))}).setParentsHidden(new String[]{"THAUMIUM", "INFUSION"}).setConcealed().registerResearchItem(); + (new DarkResearchItem("ROD_tainted", "TAINT", (new AspectList()).add(Aspect.MAGIC, 1).add(Aspect.TAINT, 2).add(Aspect.TOOL, 1), -4, -5, 4, new ItemStack(ForbiddenItems.wandCore, 1, 0))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.ROD_tainted.1"), new ResearchPage((InfusionRecipe)recipes.get("WandRodTainted"))}).setParents(new String[]{"ROD_silverwood", "TAINTSHOVEL"}).setConcealed().registerResearchItem(); + } } \ No newline at end of file