From 89483b28e4db8ac66568f0d37b1f3a8a03c437b3 Mon Sep 17 00:00:00 2001 From: Jeremy Diamond Date: Tue, 25 Feb 2014 01:53:21 -0800 Subject: [PATCH] TC 4.1 compatibility Updating research. Updating Wrath Cage. --- assets/forbidden/lang/en_US.lang | 9 +- .../spiteful/forbidden/DarkResearchItem.java | 21 +- .../spiteful/forbidden/FMEventHandler.java | 2 +- .../spiteful/forbidden/ForbiddenResearch.java | 32 +-- .../forbidden/blocks/BlockArcaneCake.java | 2 +- .../forbidden/blocks/BlockWrathCage.java | 7 + .../forbidden/tiles/TileEntityWrathCage.java | 202 ++++++++++++------ 7 files changed, 192 insertions(+), 83 deletions(-) diff --git a/assets/forbidden/lang/en_US.lang b/assets/forbidden/lang/en_US.lang index dcec204..4556494 100644 --- a/assets/forbidden/lang/en_US.lang +++ b/assets/forbidden/lang/en_US.lang @@ -33,6 +33,7 @@ item.MobCrystal.name=Imprinted Crystal item.DiabolistFork.name=Diabolist Fork item.DiabolistSpork.name=Spork of Doom item.GluttonyShard.name=Gluttony Shard +item.Bloodwell.name=Bloody Scrivener's Tools # # Wand components item.Wand.tainted.rod=Tainted @@ -142,13 +143,13 @@ forbidden.research_page.BLACKFLOWER.1=There's no sight more pathetic than a sogg forbidden.research_name.WRATHCAGE=Wrath Cage forbidden.research_text.WRATHCAGE=Neverending battle forbidden.research_page.WRATHCAGE.1=Sometimes, it's not enough to just kill something. Sure, slaying a single monster may be rather cathartic, but imagine just mowing down a crowd of the obnoxious little jerks.

To that end, you've discovered a way to recreate the monster spawners found in the ancient ruins. Unlike the original monster spawners, the Wrath Cage responds to redstone controls instead of the presence of human beings and can run much faster than the ancient devices. -forbidden.research_page.WRATHCAGE.2=However, you haven't been able to duplicate the original method of infinite creation. For every creature spawned, the Wrath Cage requires a bit of essentia piped into its internal reserves. The device will accept different types of essentia depending on the creature it is attuned to. Alternatively, piping Ira into the cage can serve as a fuel. The cage can also accept Desidia for some reason. +forbidden.research_page.WRATHCAGE.2=However, you haven't been able to duplicate the original method of infinite creation. For every creature spawned, the Wrath Cage requires a bit of essentia piped into its internal reserves. The device will accept different types of essentia depending on the creature it is attuned to. Alternatively, piping Ira into the cage can serve as a fuel. The cage can also accept Desidia for some reason.

Right-clicking the Wrath Cage with a Diabolist Fork will cycle the cage between the different fuel types, changing which essentia it applies suction to. forbidden.research_page.WRATHCAGE.3=To attune a wrath cage to a specific creature, right click on it with an imprinted crystal. Slaying a compatible creature with a Diabolist Fork while carrying a blank imprinting crystal will attune the crystal to that monster. # forbidden.research_name.FORK=Diabolist Fork forbidden.research_text.FORK=Arcane tinkering tool forbidden.research_page.FORK.1=You've created a tool to help you tinker with various infernal contraptions. The quartz prongs on the Diabolist Fork allow it to attune itself to arcane energies.

Along with being used to tune devices, the fork also makes for a functional weapon.

More information should appear in the following pages as you uncover more research. -forbidden.research_page.FORK.wc=If the Diabolist Fork is used to slay a compatible creature with a Blank Imprinting Crystal in your inventory, it will imprint on the crystal. The Imprinted Crystal can then be used to attune a Wrath Cage to that monster. +forbidden.research_page.FORK.wc=If the Diabolist Fork is used to slay a compatible creature with a Blank Imprinting Crystal in your inventory, it will imprint on the crystal. The Imprinted Crystal can then be used to attune a Wrath Cage to that monster.

The fork can also be used to adjust which essentia type a Wrath Cage is using for fuel. Simply right click on the Wrath Cage with the Diabolist Fork to cycle between the three different fuel types. # forbidden.research_name.MORPHTOOLS=Chameleon Tools forbidden.research_text.MORPHTOOLS=There's an enchantment for that... @@ -182,4 +183,8 @@ 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. +# +forbidden.research_name.BLOODWELL=Bloody Scrivener's Tools +forbidden.research_text.BLOODWELL="I'll complete this research if it kills me!" +forbidden.research_page.BLOODWELL.1=There's nothing more frustrating than having to pause your research to refill your inkwell. Sometimes, you're just so desperate to complete a research you'd rather use your own blood as ink than stop to go find a refill.

The Bloody Scrivener's Tools will refill using Life Points from their owner's network, at a rate of 25 LP per point. This ability requires human warmth to activate, requiring you to remove the tools from the research table, but without having to actually leave the research area. # \ No newline at end of file diff --git a/src/com/spiteful/forbidden/DarkResearchItem.java b/src/com/spiteful/forbidden/DarkResearchItem.java index 6f3aeb4..a9298e4 100644 --- a/src/com/spiteful/forbidden/DarkResearchItem.java +++ b/src/com/spiteful/forbidden/DarkResearchItem.java @@ -11,6 +11,8 @@ import thaumcraft.api.research.ResearchItem; public class DarkResearchItem extends ResearchItem { + String inter = null; + public DarkResearchItem(String par1, String par2) { super(par1, par2); @@ -25,6 +27,18 @@ public class DarkResearchItem extends ResearchItem { super(par1, par2, tags, par3, par4, par5, icon); } + + public DarkResearchItem(String par1, String par2, String mod, AspectList tags, int par3, int par4, int par5, ResourceLocation icon) + { + super(par1, par2, tags, par3, par4, par5, icon); + inter = mod; + } + + public DarkResearchItem(String par1, String par2, String mod, AspectList tags, int par3, int par4, int par5, ItemStack icon) + { + super(par1, par2, tags, par3, par4, par5, icon); + inter = mod; + } @SideOnly(Side.CLIENT) public String getName() @@ -36,7 +50,12 @@ public class DarkResearchItem extends ResearchItem public String getText() { if(Config.tagResearch) - return "[FM] " + StatCollector.translateToLocal("forbidden.research_text." + key); + { + if(inter == null) + return "[FM] " + StatCollector.translateToLocal("forbidden.research_text." + key); + else + return "[FM] " + inter + " " + StatCollector.translateToLocal("forbidden.research_text." + key); + } else return StatCollector.translateToLocal("forbidden.research_text." + key); } diff --git a/src/com/spiteful/forbidden/FMEventHandler.java b/src/com/spiteful/forbidden/FMEventHandler.java index 9d537e7..01156b7 100644 --- a/src/com/spiteful/forbidden/FMEventHandler.java +++ b/src/com/spiteful/forbidden/FMEventHandler.java @@ -241,7 +241,7 @@ public class FMEventHandler if(name == null) return; } - if(Config.spawnerMobs.containsKey(name)) + if(Config.spawnerMobs.containsKey(name) ||(Config.wrathCrazy && !(event.entityLiving instanceof IBossDisplayData))) imprintCrystal((EntityPlayer)(event.source.getEntity()), name); } diff --git a/src/com/spiteful/forbidden/ForbiddenResearch.java b/src/com/spiteful/forbidden/ForbiddenResearch.java index aa3cd09..8d72162 100644 --- a/src/com/spiteful/forbidden/ForbiddenResearch.java +++ b/src/com/spiteful/forbidden/ForbiddenResearch.java @@ -45,13 +45,13 @@ public class ForbiddenResearch addTaint(); if(Config.emeraldTrans) - (new DarkResearchItem("TRANSEMERALD", "FORBIDDEN", (new AspectList()).add(Aspect.CRYSTAL, 1).add(Aspect.EXCHANGE, 1).add(Aspect.GREED, 2), -6, 4, 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", "FORBIDDEN", (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.SENSES, 1).add(Aspect.DARKNESS, 2), -7, 4, 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(); + (new DarkResearchItem("TRANSEMERALD", "FORBIDDEN", (new AspectList()).add(Aspect.CRYSTAL, 2).add(Aspect.EXCHANGE, 5).add(Aspect.GREED, 4), -6, 4, 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 DarkResearchItem("BLACKFLOWER", "FORBIDDEN", (new AspectList()).add(Aspect.PLANT, 3).add(Aspect.SENSES, 2).add(Aspect.DARKNESS, 4), -7, 4, 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"))}).setAspectTriggers(new Aspect[]{Aspect.SENSES}).registerResearchItem(); - (new DarkResearchItem("CONSUMING", "FORBIDDEN", (new AspectList()).add(Aspect.VOID, 2).add(Aspect.ENTROPY, 1).add(Aspect.MAGIC, 1), -1, 2, 3, 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[]{"INFAUXSIONENCHANTMENT"}).setConcealed().registerResearchItem(); - (new DarkResearchItem("PIGBANE", "FORBIDDEN", (new AspectList()).add(Aspect.HUNGER, 2).add(Aspect.WEAPON, 1).add(Aspect.MAGIC, 1), -1, 3, 2, new ResourceLocation("forbidden", "textures/misc/pigbane.png"))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.PIGBANE.1"), new ResearchPage((InfusionEnchantmentRecipe)recipes.get("Pigbane"))}).setParents(new String[]{"INFAUXSIONENCHANTMENT"}).setConcealed().registerResearchItem(); - (new DarkResearchItem("EDUCATIONAL", "FORBIDDEN", (new AspectList()).add(Aspect.MIND, 2).add(Aspect.WEAPON, 1).add(Aspect.MAGIC, 1), -1, 4, 4, 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[]{"INFAUXSIONENCHANTMENT"}).setConcealed().registerResearchItem(); + (new DarkResearchItem("CONSUMING", "FORBIDDEN", (new AspectList()).add(Aspect.VOID, 4).add(Aspect.ENTROPY, 3).add(Aspect.MAGIC, 2), -1, 2, 3, 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[]{"INFAUXSIONENCHANTMENT"}).setSecondary().setConcealed().registerResearchItem(); + (new DarkResearchItem("PIGBANE", "FORBIDDEN", (new AspectList()).add(Aspect.HUNGER, 3).add(Aspect.WEAPON, 4).add(Aspect.MAGIC, 2), -1, 3, 2, new ResourceLocation("forbidden", "textures/misc/pigbane.png"))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.PIGBANE.1"), new ResearchPage((InfusionEnchantmentRecipe)recipes.get("Pigbane"))}).setParents(new String[]{"INFAUXSIONENCHANTMENT"}).setSecondary().setConcealed().registerResearchItem(); + (new DarkResearchItem("EDUCATIONAL", "FORBIDDEN", (new AspectList()).add(Aspect.MIND, 5).add(Aspect.WEAPON, 1).add(Aspect.MAGIC, 3), -1, 4, 4, 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[]{"INFAUXSIONENCHANTMENT"}).setSecondary().setConcealed().registerResearchItem(); } @@ -65,20 +65,20 @@ public class ForbiddenResearch else (new DarkResearchItem("NETHERSHARDS", "FORBIDDEN", new AspectList(), -8, -2, 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")}).setStub().setRound().setAutoUnlock().registerResearchItem(); - (new DarkResearchItem("SKULLAXE", "FORBIDDEN", (new AspectList()).add(Aspect.WEAPON, 1).add(DarkAspects.WRATH, 2).add(DarkAspects.NETHER, 1), -8, 1, 4, new ItemStack(ForbiddenItems.skullAxe))).setPages(new ResearchPage[] {new ResearchPage("forbidden.research_page.SKULLAXE.1"), new ResearchPage((InfusionRecipe)recipes.get("SkullAxe"))}).setParents(new String[] {"THAUMIUM", "INFAUXSION"}).setConcealed().registerResearchItem(); - (new DarkResearchItem("ARCANECAKE", "FORBIDDEN", (new AspectList()).add(DarkAspects.GLUTTONY, 2).add(Aspect.HUNGER, 1).add(Aspect.CRAFT, 1), -8, 2, 3, new ItemStack(ForbiddenItems.arcaneCakeItem))).setPages(new ResearchPage[] {new ResearchPage("forbidden.research_page.ARCANECAKE.1"), new ResearchPage((InfusionRecipe)recipes.get("ArcaneCake"))}).setParents(new String[] {"INFAUXSION"}).setHidden().registerResearchItem(); + (new DarkResearchItem("SKULLAXE", "FORBIDDEN", (new AspectList()).add(Aspect.WEAPON, 3).add(DarkAspects.WRATH, 4).add(DarkAspects.NETHER, 1), -8, 1, 4, new ItemStack(ForbiddenItems.skullAxe))).setPages(new ResearchPage[] {new ResearchPage("forbidden.research_page.SKULLAXE.1"), new ResearchPage((InfusionRecipe)recipes.get("SkullAxe"))}).setParents(new String[] {"THAUMIUM", "INFAUXSION"}).setConcealed().registerResearchItem(); + (new DarkResearchItem("ARCANECAKE", "FORBIDDEN", (new AspectList()).add(DarkAspects.GLUTTONY, 4).add(Aspect.HUNGER, 3).add(Aspect.CRAFT, 2), -8, 2, 3, new ItemStack(ForbiddenItems.arcaneCakeItem))).setPages(new ResearchPage[] {new ResearchPage("forbidden.research_page.ARCANECAKE.1"), new ResearchPage((InfusionRecipe)recipes.get("ArcaneCake"))}).setParents(new String[] {"INFAUXSION"}).setAspectTriggers(new Aspect[]{DarkAspects.GLUTTONY}).registerResearchItem(); (new DarkResearchItem("MORPHTOOLS", "FORBIDDEN", (new AspectList()).add(Aspect.TOOL, 2).add(DarkAspects.ENVY, 3).add(Aspect.EXCHANGE, 2), -5, 5, 5, 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[]{"INFAUXSIONENCHANTMENT"}).setConcealed().registerResearchItem(); - (new DarkResearchItem("ROD_infernal", "FORBIDDEN", (new AspectList()).add(DarkAspects.NETHER, 2).add(Aspect.FIRE, 1).add(Aspect.TOOL, 1), -6, -3, 5, new ItemStack(ForbiddenItems.wandCore, 1, 1))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.ROD_infernal.1"), new ResearchPage((InfusionRecipe)recipes.get("WandRodInfernal")), new ResearchPage("forbidden.research_page.ROD_infernal.2")}).setParents(new String[]{"ROD_silverwood", "INFAUXSION"}).setConcealed().registerResearchItem(); - (new DarkResearchItem("CLUSTER", "FORBIDDEN", (new AspectList()).add(Aspect.METAL, 1).add(Aspect.FIRE, 2).add(DarkAspects.ENVY, 1), -7, 7, 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"}).setConcealed().registerResearchItem(); + (new DarkResearchItem("ROD_infernal", "FORBIDDEN", (new AspectList()).add(DarkAspects.NETHER, 4).add(Aspect.FIRE, 3).add(Aspect.TOOL, 1), -6, -3, 5, new ItemStack(ForbiddenItems.wandCore, 1, 1))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.ROD_infernal.1"), new ResearchPage((InfusionRecipe)recipes.get("WandRodInfernal")), new ResearchPage("forbidden.research_page.ROD_infernal.2")}).setParents(new String[]{"ROD_silverwood", "INFAUXSION"}).setConcealed().registerResearchItem(); + (new DarkResearchItem("CLUSTER", "FORBIDDEN", (new AspectList()).add(Aspect.METAL, 1).add(Aspect.FIRE, 4).add(DarkAspects.ENVY, 3), -7, 7, 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().registerResearchItem(); if(Config.greedyEnch) - (new DarkResearchItem("GREEDY", "FORBIDDEN", (new AspectList()).add(Aspect.MAGIC, 1).add(Aspect.WEAPON, 1).add(Aspect.GREED, 2), -1, 5, 4, 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[]{"INFAUXSIONENCHANTMENT"}).setConcealed().registerResearchItem(); - (new DarkResearchItem("CORRUPTING", "FORBIDDEN", (new AspectList()).add(DarkAspects.NETHER, 2).add(Aspect.CRYSTAL, 1).add(Aspect.EXCHANGE, 1), -1, 6, 4, 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[]{"INFAUXSIONENCHANTMENT"}).setConcealed().registerResearchItem(); + (new DarkResearchItem("GREEDY", "FORBIDDEN", (new AspectList()).add(Aspect.MAGIC, 2).add(Aspect.WEAPON, 1).add(Aspect.GREED, 3), -1, 5, 4, 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[]{"INFAUXSIONENCHANTMENT"}).setConcealed().registerResearchItem(); + (new DarkResearchItem("CORRUPTING", "FORBIDDEN", (new AspectList()).add(DarkAspects.NETHER, 5).add(Aspect.CRYSTAL, 2).add(Aspect.EXCHANGE, 1), -1, 6, 4, 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[]{"INFAUXSIONENCHANTMENT"}).setConcealed().registerResearchItem(); if(Config.wrathCage){ if(Config.wrathCost > 0) - (new DarkResearchItem("WRATHCAGE", "FORBIDDEN", (new AspectList()).add(DarkAspects.WRATH, 2).add(Aspect.MECHANISM, 1).add(Aspect.BEAST, 1), -2, 0, 6, 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[]{"INFAUXSION"}).setParentsHidden(new String[]{"THAUMIUM"}).setSiblings(new String[]{"FORK"}).setHidden().registerResearchItem(); + (new DarkResearchItem("WRATHCAGE", "FORBIDDEN", (new AspectList()).add(DarkAspects.WRATH, 5).add(Aspect.MECHANISM, 3).add(Aspect.BEAST, 2), -2, 0, 6, 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[]{"INFAUXSION"}).setParentsHidden(new String[]{"THAUMIUM", "DISTILESSENTIA"}).setSiblings(new String[]{"FORK"}).registerResearchItem(); else - (new DarkResearchItem("WRATHCAGE", "FORBIDDEN", (new AspectList()).add(DarkAspects.WRATH, 2).add(Aspect.MECHANISM, 1).add(Aspect.BEAST, 1), -2, 0, 6, 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[]{"INFAUXSION"}).setParentsHidden(new String[]{"THAUMIUM"}).setSiblings(new String[]{"FORK"}).setHidden().registerResearchItem(); + (new DarkResearchItem("WRATHCAGE", "FORBIDDEN", (new AspectList()).add(DarkAspects.WRATH, 5).add(Aspect.MECHANISM, 3).add(Aspect.BEAST, 2), -2, 0, 6, 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[]{"INFAUXSION"}).setParentsHidden(new String[]{"THAUMIUM", "DISTILESSENTIA"}).setSiblings(new String[]{"FORK"}).registerResearchItem(); } @@ -95,8 +95,8 @@ public class ForbiddenResearch } - (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(); + (new DarkResearchItem("TAINTSHOVEL", "TAINT", (new AspectList()).add(Aspect.CRYSTAL, 3).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, 2).add(Aspect.TAINT, 4).add(Aspect.ENTROPY, 3), -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, 4).add(Aspect.TAINT, 5).add(Aspect.TOOL, 2), -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 diff --git a/src/com/spiteful/forbidden/blocks/BlockArcaneCake.java b/src/com/spiteful/forbidden/blocks/BlockArcaneCake.java index 80fd912..58b1cc4 100644 --- a/src/com/spiteful/forbidden/blocks/BlockArcaneCake.java +++ b/src/com/spiteful/forbidden/blocks/BlockArcaneCake.java @@ -143,7 +143,7 @@ public class BlockArcaneCake extends Block { if (par5EntityPlayer.canEat(false)) { - par5EntityPlayer.getFoodStats().addStats(2, 3.0F); + par5EntityPlayer.getFoodStats().addStats(2, 1.0F); int l = par1World.getBlockMetadata(par2, par3, par4) + 1; if (l >= 12) diff --git a/src/com/spiteful/forbidden/blocks/BlockWrathCage.java b/src/com/spiteful/forbidden/blocks/BlockWrathCage.java index 2e95c1e..ca4310d 100644 --- a/src/com/spiteful/forbidden/blocks/BlockWrathCage.java +++ b/src/com/spiteful/forbidden/blocks/BlockWrathCage.java @@ -3,6 +3,7 @@ package com.spiteful.forbidden.blocks; import com.spiteful.forbidden.tiles.TileEntityWrathCage; import com.spiteful.forbidden.items.ForbiddenItems; import com.spiteful.forbidden.Forbidden; +import com.spiteful.forbidden.Config; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -92,6 +93,12 @@ public class BlockWrathCage extends BlockContainer return true; } } + else if(held != null && held.itemID == ForbiddenItems.fork.itemID && Config.wrathCost > 0){ + TileEntityWrathCage spawner = (TileEntityWrathCage)par1World.getBlockTileEntity(x, y, z); + if(++spawner.mode > 2) + spawner.mode = 0; + player.swingItem(); + } return false; } diff --git a/src/com/spiteful/forbidden/tiles/TileEntityWrathCage.java b/src/com/spiteful/forbidden/tiles/TileEntityWrathCage.java index 3d44604..a81566e 100644 --- a/src/com/spiteful/forbidden/tiles/TileEntityWrathCage.java +++ b/src/com/spiteful/forbidden/tiles/TileEntityWrathCage.java @@ -31,7 +31,8 @@ public class TileEntityWrathCage extends TileEntity implements IAspectContainer, public int wrath = 0; public int sloth = 0; public int special = 0; - Aspect aspect; + public byte mode = 0; + Aspect aspect = Aspect.GREED; @Override /** @@ -44,6 +45,7 @@ public class TileEntityWrathCage extends TileEntity implements IAspectContainer, this.wrath = par1NBTTagCompound.getShort("Wrath"); this.sloth = par1NBTTagCompound.getShort("Sloth"); this.special = par1NBTTagCompound.getShort("Special"); + this.mode = par1NBTTagCompound.getByte("Mode"); aspect = spawnLogic.getAspect(); } @@ -58,6 +60,7 @@ public class TileEntityWrathCage extends TileEntity implements IAspectContainer, par1NBTTagCompound.setShort("Wrath", (short)this.wrath); par1NBTTagCompound.setShort("Sloth", (short)this.sloth); par1NBTTagCompound.setShort("Special", (short)this.special); + par1NBTTagCompound.setByte("Mode", this.mode); } @Override @@ -97,19 +100,19 @@ public class TileEntityWrathCage extends TileEntity implements IAspectContainer, if(te != null) { IEssentiaTransport ic = (IEssentiaTransport)te; if(ic.canOutputTo(current.getOpposite()) && special < 64 - && ic.getSuction(current.getOpposite()).getAmount(aspect) < this.getSuction(current).getAmount(aspect) && ic.takeVis(aspect, 1) == 1) { + && ic.getEssentiaType(current.getOpposite()) == aspect && ic.getEssentiaAmount(current.getOpposite()) > 0 && ic.takeVis(aspect, 1) == 1) { special++; worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); return; } else if(ic.canOutputTo(current.getOpposite()) && wrath < 64 && special < Config.wrathCost - && ic.getSuction(current.getOpposite()).getAmount(DarkAspects.WRATH) < this.getSuction(current).getAmount(DarkAspects.WRATH) && ic.takeVis(DarkAspects.WRATH, 1) == 1) { + && ic.getEssentiaType(current.getOpposite()) == DarkAspects.WRATH && ic.getEssentiaAmount(current.getOpposite()) > 0 && ic.takeVis(DarkAspects.WRATH, 1) == 1) { wrath++; worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); return; } else if(ic.canOutputTo(current.getOpposite()) && sloth < 64 && special < Config.wrathCost && wrath < Config.wrathCost - && ic.getSuction(current.getOpposite()).getAmount(DarkAspects.SLOTH) < this.getSuction(current).getAmount(DarkAspects.SLOTH) && ic.takeVis(DarkAspects.SLOTH, 1) == 1) { + && ic.getEssentiaType(current.getOpposite()) == DarkAspects.SLOTH && ic.getEssentiaAmount(current.getOpposite()) > 0 && ic.takeVis(DarkAspects.SLOTH, 1) == 1) { sloth++; worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); return; @@ -144,7 +147,14 @@ public class TileEntityWrathCage extends TileEntity implements IAspectContainer, { AspectList list = new AspectList(); if(Config.wrathCost > 0 && spawnLogic.isMobSet()) - list.add(DarkAspects.WRATH, wrath).add(DarkAspects.SLOTH, sloth).add(aspect, special); + { + if(mode == 0) + list.add(aspect, special); + else if(mode == 1) + list.add(DarkAspects.WRATH, wrath); + else + list.add(DarkAspects.SLOTH, sloth); + } return list; } @@ -203,16 +213,6 @@ public class TileEntityWrathCage extends TileEntity implements IAspectContainer, return false; } - /** - * removes a bunch of different aspects and amounts from the tile entity. - * @param ot the ObjectTags object that contains the aspects and their amounts. - * @return true if all the aspects and their amounts were available and successfully removed - */ - public boolean takeFromContainer(AspectList ot) - { - return false; - } - /** * Checks if the tile entity contains the listed amount (or more) of the aspect * @param tag @@ -231,26 +231,6 @@ public class TileEntityWrathCage extends TileEntity implements IAspectContainer, return false; } - /** - * Checks if the tile entity contains all the listed aspects and their amounts - * @param ot the ObjectTags object that contains the aspects and their amounts. - * @return - */ - public boolean doesContainerContain(AspectList ot){ - for (Aspect asp: ot.getAspects()) - { - if(asp == DarkAspects.WRATH && wrath < ot.getAmount(DarkAspects.WRATH)) - return false; - else if(asp == DarkAspects.SLOTH && sloth < ot.getAmount(DarkAspects.SLOTH)) - return false; - else if(asp == aspect && special < ot.getAmount(aspect)) - return false; - else if(asp != DarkAspects.WRATH && asp != DarkAspects.SLOTH && asp != aspect) - return false; - } - return true; - } - /** * Returns how much of the aspect this tile entity contains * @param tag @@ -268,6 +248,32 @@ public class TileEntityWrathCage extends TileEntity implements IAspectContainer, return 0; } + /** + * Checks if the tile entity contains all the listed aspects and their amounts + * @param ot the ObjectTags object that contains the aspects and their amounts. + * @return + * + * Going away in the next major patch + */ + @Deprecated + public boolean doesContainerContain(AspectList ot) + { + return false; + } + + /** + * removes a bunch of different aspects and amounts from the tile entity. + * @param ot the ObjectTags object that contains the aspects and their amounts. + * @return true if all the aspects and their amounts were available and successfully removed + * + * Going away in the next major patch + */ + @Deprecated + public boolean takeFromContainer(AspectList ot) + { + return false; + } + /** * Is this tile able to connect to other vis users/sources on the specified side? * @param face @@ -275,7 +281,10 @@ public class TileEntityWrathCage extends TileEntity implements IAspectContainer, */ public boolean isConnectable(ForgeDirection face) { - return true; + if(Config.wrathCost > 0) + return true; + else + return false; } /** @@ -298,15 +307,6 @@ public class TileEntityWrathCage extends TileEntity implements IAspectContainer, return false; } - /** - * Sets the amount of suction this block will apply - * @param suction - */ - public void setSuction(AspectList suction) - { - - } - /** * Sets the amount of suction this block will apply * @param suction @@ -316,27 +316,60 @@ public class TileEntityWrathCage extends TileEntity implements IAspectContainer, } + //** + //* Returns the amount of suction this block is applying. + //* @param loc + //* the location from where the suction is being checked + //* @return + //*/ + //public AspectList getSuction(ForgeDirection face) + //{ + //AspectList list = new AspectList(); + //if(Config.wrathCost <= 0) + //return list; + //if(special < 64) + //list.add(aspect, 256); + //if(special < Config.wrathCost && wrath < 64) + //list.add(DarkAspects.WRATH, 256); + //if(special < Config.wrathCost && wrath < Config.wrathCost && sloth < 64) + //list.add(DarkAspects.SLOTH, 256); + + //return list; + //} + /** - * Returns the amount of suction this block is applying. + * Returns the type of suction this block is applying. + * @param loc + * the location from where the suction is being checked + * @return + * a return type of null indicates the suction is untyped and the first thing available will be drawn + */ + public Aspect getSuctionType(ForgeDirection face) + { + if(Config.wrathCost <= 0) + return null; + if(mode == 0) + return aspect; + else if(mode == 1) + return DarkAspects.WRATH; + else + return DarkAspects.SLOTH; + } + + /** + * Returns the strength of suction this block is applying. * @param loc * the location from where the suction is being checked * @return */ - public AspectList getSuction(ForgeDirection face) + public int getSuctionAmount(ForgeDirection face) { - AspectList list = new AspectList(); - if(Config.wrathCost <= 0) - return list; - if(special < 64) - list.add(aspect, 256); - if(special < Config.wrathCost && wrath < 64) - list.add(DarkAspects.WRATH, 256); - if(special < Config.wrathCost && wrath < Config.wrathCost && sloth < 64) - list.add(DarkAspects.SLOTH, 256); - - return list; + if(Config.wrathCost > 0) + return 256; + else + return 0; } - + /** * remove the specified amount of vis from this transport tile * @param suction @@ -346,10 +379,55 @@ public class TileEntityWrathCage extends TileEntity implements IAspectContainer, { return 0; } - - public AspectList getEssentia(ForgeDirection face) + + /** + * add the specified amount of vis to this transport tile + * @return how much was actually added + */ + public int addVis(Aspect inp, int amount) { - return getAspects(); + if(inp == aspect) + { + special += Math.min(amount, 64); + return Math.min(amount, 64); + } + else if(inp == DarkAspects.WRATH) + { + wrath += Math.min(amount, 64); + return Math.min(amount, 64); + } + else if(inp == DarkAspects.SLOTH) + { + sloth += Math.min(amount, 64); + return Math.min(amount, 64); + } + else + return amount; + } + + /** + * What type of essentia this contains + * @param face + * @return + */ + public Aspect getEssentiaType(ForgeDirection face) + { + return getSuctionType(face); + } + + /** + * How much essentia this block contains + * @param face + * @return + */ + public int getEssentiaAmount(ForgeDirection face) + { + if(mode == 0) + return special; + else if(mode == 1) + return wrath; + else + return sloth; } /**