diff --git a/assets/forbidden/lang/en_US.lang b/assets/forbidden/lang/en_US.lang index 62eba51..c707c42 100644 --- a/assets/forbidden/lang/en_US.lang +++ b/assets/forbidden/lang/en_US.lang @@ -28,12 +28,14 @@ item.MorphShovel.name=Chameleon Shovel item.MorphAxe.name=Chameleon Axe item.FMResource.0.name=Emerald Fragment item.FMResource.1.name=Shadow Ink +item.FMResource.2.name=Manasteel Nugget item.MobCrystalEmpty.name=Blank Imprinting Crystal 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 +item.DivineOrb.name=Transcendent Blood Orb item.Crystalwell.name=Crystal Scribing Tools item.RidingCrop.name=Riding Crop # @@ -44,18 +46,27 @@ item.Wand.neutronium.rod=Cosmic Neutronium item.Wand.soul.rod=Eldritch item.Wand.blood.rod=Blood item.Wand.witchwood.rod=Witchwood +item.Wand.totem.rod=Totem +item.Wand.livingwood.rod=Livingwood item.Wand.orichalcum.cap=Orichalcum Studded item.Wand.alchemical.cap=Alchemically Crowned -item.Wand.vinteum.cap=Vinteum Bound +item.Wand.vinteum.cap=Vinteum Bossed item.Wand.soul.cap=Ender Shielded +item.Wand.manasteel.cap=Manasteel Entwined item.WandCores.tainted.name=Tainted Rod item.WandCores.infernal.name=Infernal Rod item.WandCores.soul.name=Eldritch Rod -item.WandCores.blood.name=Bloody Rod +item.WandCores.blood.name=Blood Rod item.WandCores.witchwood.name=Witchwood Rod +item.WandCores.totem.name=Totemic Rod +item.WandCores.blood_inert.name=Inert Blood Rod +item.WandCores.livingwood.name=Livingwood Rod +item.WandCores.livingwood_inert.name=Dormant Livingwood Rod item.WandCaps.alchemical.name=Alchemical Cap item.WandCaps.vinteum.name=Vinteum Cap item.WandCaps.soul.name=Ender Cap +item.WandCaps.manasteel.name=Manasteel Cap +item.WandCaps.manasteel_inert.name=Inert Manasteel Cap # # Blocks tile.ArcaneCake.name=Thaumic Cake @@ -114,14 +125,23 @@ forbidden.research_name.ROD_soul=Eldritch Wand Core forbidden.research_text.ROD_soul=Corrupting vis storage forbidden.research_page.ROD_soul.1=You've discovered a way to tap the energy flowing through a Player Beacon and turn it into vis. As long as you're in a dimension with an active Player Beacon attuned to yourself, the Eldritch Wand Core will slowly charge all its internal reserves, which can hold up to 100 vis.

Channeling such great amounts of energy through your soul comes at a price, however. Each point of vis creates large amounts of corruption in your soul. It's best not to rely on its recharge abilities too greatly... # -forbidden.research_name.ROD_blood=Bloody Wand Core +forbidden.research_name.ROD_blood=Blood Wand Core forbidden.research_text.ROD_blood=Alchemical vis storage forbidden.research_page.ROD_blood.1=You've created a bridge between Thaumaturgy and Alchemical Wizardry. The Blood Wand can store up to 100 vis and will gradually fill itself using Life Points.

The wand will bind itself to the first person to pick it up. As long as the rod is empty, it will try to fill itself using LP from its owner's network. If there are not enough Life Points to fuel it, it will resort to drawing health from whoever is carrying it, but this conversion is less efficient. If it has no LP to draw from and its holder falls below three hearts, the wand stops charging itself. +forbidden.research_page.ROD_blood.2=The infusion process alone isn't enough to complete a Blood Wand. Once the Inert Blood Rod has been infused, it must be imbued with life essence in a Blood Altar to be completed. # forbidden.research_name.ROD_witchwood=Witchwood Wand Core forbidden.research_text.ROD_witchwood=Mana converter forbidden.research_page.ROD_witchwood.1=By creating a wand core out of Witchwood, you've discovered a way to convert mana into Vis. The Witchwood Wand Core holds up to 100 vis and will gradually charge itself at the cost of 150 mana per point of vis.

Further research may reveal ways to lower this price. # +forbidden.research_name.ROD_totem=Totemic Wand Core +forbidden.research_text.ROD_totem=Verdant vis storage +forbidden.research_page.ROD_totem.1=Hunting down nodes for their power can be quite a pain sometimes. Perhaps there is another discipline you can tap for power...

By carving a wand core from Infused Wood and inlaying it with chlorophyllic metal, you create a wand that can draw power from plant energy. The Totemic Wand Core holds 50 vis and can draw energy from Chlorophyll Crystals in your inventory to recharge its own vis. +# +forbidden.research_name.ROD_livingwood=Livingwood Wand Core +forbidden.research_text.ROD_livingwood=Botanical vis storage +forbidden.research_page.ROD_livingwood.1=Livingwood has the fantastic ability to manipulate mana. When combined with the right reagents, it can even convert mana into vis.

The Livingwood Wand will quickly draw mana from storage items in your inventory in order to charge itself. Each point of vis costs 800 mana, but further research may ameliorate this.

The infusion process burns out the livingwood, unfortunately. Once infused, the wand rod must be charged in a mana pool in order to be awakened. +# forbidden.research_name.CAP_alchemical=Alchemical Caps forbidden.research_text.CAP_alchemical=When Thaumium isn't bloody enough forbidden.research_page.CAP_alchemical.1=You've developed a wand cap that merges Thaumaturgy and Alchemical Wizardry. Alchemical Caps are very effective at channeling Aqua, only using 80% of the normal vis cost. Unfortunately, they're less effective than Thaumium at channeling other aspects, offering only a 95% rate on everything else.

If combined with a Bloody Wand Core, Alchemical Caps discount the amount of LP consumed by the wand, costing only 900 LP per vis. The caps also cause all attacks from a blood wand to inflict Weakness. @@ -134,6 +154,10 @@ forbidden.research_name.CAP_soul=Ender Caps forbidden.research_text.CAP_soul=Protection for your soul forbidden.research_page.CAP_soul.1=You've created a wand cap that can safely channel the destructive energy of The End. Ender Caps have an 80% vis rate on Perditio, but only 95% for other aspects.

When combined with an Eldritch Wand Core, Ender Caps also reduce the amount of corruption your soul suffers from channeling vis out of the End. # +forbidden.research_name.CAP_manasteel=Manasteel Caps +forbidden.research_text.CAP_manasteel=The secret of mana +forbidden.research_page.CAP_manasteel.1=Manasteel has very useful properties when it comes to mana manipulation. When crafted into a wand cap, it offers a 90% vis rate. If combined with a Livingwood Wand, it makes the conversion process more efficient, needing only 600 mana per point of vis.

In order to be used in the creation of a wand, the Inert Manasteel Caps must be infused in a Mana Pool. +# forbidden.research_name.TRANSEMERALD=Emerald Transmutation forbidden.research_text.TRANSEMERALD=Transformation of valuables into emerald forbidden.research_page.TRANSEMERALD.1=You have discovered a way to multiply emeralds by steeping emerald fragments in lucrum harvested from other substances. @@ -190,6 +214,10 @@ 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. # +forbidden.research_name.DIVINEORB=Transcendent Blood Orb +forbidden.research_text.DIVINEORB=Orb of Armok +forbidden.research_page.DIVINEORB.1=It is whispered among some Thaumaturgic circles that Ichor is actually the blood of the divine. You don't know whether this is true or not, but Ichor does seem to have an affinity with more advanced alchemical devices.

The Transcendent Blood Orb is what happens when you combine the most advanced Thaumaturgy and Alchemical Wizardry available. The infusion vastly increases the orb's carrying capacity, allowing it to hold a whopping 70,000,000 LP. What would you ever need that much LP for? +# forbidden.research_name.CRYSTALWELL=Crystal Scribing Tools forbidden.research_text.CRYSTALWELL=Arcane Research Grant forbidden.research_page.CRYSTALWELL.1=Combining elemental shards with your inkwell results in some interesting effects. The Crystal Scribing Tools seem to absorb knowledge as you use them to write. Once the well is empty of ink, you can absorb this knowledge for a small burst of research points by holding the tools in your hand and right clicking. Unfortunately, this burns the tool out and turns it back into a mundane Scribing Tool again. @@ -197,4 +225,8 @@ forbidden.research_page.CRYSTALWELL.1=Combining elemental shards with your inkwe forbidden.research_name.RIDINGCROP=Riding Crop forbidden.research_text.RIDINGCROP=Motivating Pain forbidden.research_page.RIDINGCROP.1=A riding crop is, as its name suggests, a tool used to motivate mounts to move faster. Right clicking with it in your hand while riding a horse or other mount will give the mount a quick lash of pain and cause it to move faster for a little while.

You could hit other creatures with the crop too, but what would possess you to do something like that? +# +forbidden.research_name.HELLFIRE=Lord of Hellfire +forbidden.research_text.HELLFIRE=Never get stranded again +forbidden.research_page.HELLFIRE.1=Getting stranded in the Nether is the worst. You go through all the trouble of grabbing what you need, but before you can go home, some stupid ghast decides to rain on your parade by blasting the portal shut. Sure, this can be amended by carrying a flint and steel around, but who actually walks around with those things?

You've discovered a way to use vis in your wand to light fires on certain materials. Right click with a focus-less wand in your hand on the top of netherrack or obsidian to light a flame using some Ignis from your wand. # \ No newline at end of file diff --git a/assets/forbidden/textures/items/divineorb.png b/assets/forbidden/textures/items/divineorb.png new file mode 100644 index 0000000..57752c8 Binary files /dev/null and b/assets/forbidden/textures/items/divineorb.png differ diff --git a/assets/forbidden/textures/items/nuggetmanasteel.png b/assets/forbidden/textures/items/nuggetmanasteel.png new file mode 100644 index 0000000..47e00eb Binary files /dev/null and b/assets/forbidden/textures/items/nuggetmanasteel.png differ diff --git a/assets/forbidden/textures/items/wand_cap_manasteel.png b/assets/forbidden/textures/items/wand_cap_manasteel.png new file mode 100644 index 0000000..f522132 Binary files /dev/null and b/assets/forbidden/textures/items/wand_cap_manasteel.png differ diff --git a/assets/forbidden/textures/items/wand_cap_manasteel.png.mcmeta b/assets/forbidden/textures/items/wand_cap_manasteel.png.mcmeta new file mode 100644 index 0000000..ce40017 --- /dev/null +++ b/assets/forbidden/textures/items/wand_cap_manasteel.png.mcmeta @@ -0,0 +1,11 @@ +{ + "animation": { + "frametime": 3, + "frames": [ + 0, + 1, + 2, + 1 + ] + } +} diff --git a/assets/forbidden/textures/items/wand_cap_manasteel_inert.png b/assets/forbidden/textures/items/wand_cap_manasteel_inert.png new file mode 100644 index 0000000..7fc4202 Binary files /dev/null and b/assets/forbidden/textures/items/wand_cap_manasteel_inert.png differ diff --git a/assets/forbidden/textures/items/wand_rod_blood.png b/assets/forbidden/textures/items/wand_rod_blood.png index 4630cbd..780082c 100644 Binary files a/assets/forbidden/textures/items/wand_rod_blood.png and b/assets/forbidden/textures/items/wand_rod_blood.png differ diff --git a/assets/forbidden/textures/items/wand_rod_blood_inert.png b/assets/forbidden/textures/items/wand_rod_blood_inert.png new file mode 100644 index 0000000..9975c38 Binary files /dev/null and b/assets/forbidden/textures/items/wand_rod_blood_inert.png differ diff --git a/assets/forbidden/textures/items/wand_rod_infernal.png b/assets/forbidden/textures/items/wand_rod_infernal.png index 141673f..8bb6744 100644 Binary files a/assets/forbidden/textures/items/wand_rod_infernal.png and b/assets/forbidden/textures/items/wand_rod_infernal.png differ diff --git a/assets/forbidden/textures/items/wand_rod_livingwood.png b/assets/forbidden/textures/items/wand_rod_livingwood.png new file mode 100644 index 0000000..8c87058 Binary files /dev/null and b/assets/forbidden/textures/items/wand_rod_livingwood.png differ diff --git a/assets/forbidden/textures/items/wand_rod_livingwood_inert.png b/assets/forbidden/textures/items/wand_rod_livingwood_inert.png new file mode 100644 index 0000000..ae90878 Binary files /dev/null and b/assets/forbidden/textures/items/wand_rod_livingwood_inert.png differ diff --git a/assets/forbidden/textures/items/wand_rod_soul.png b/assets/forbidden/textures/items/wand_rod_soul.png index f184ebd..c5b73b5 100644 Binary files a/assets/forbidden/textures/items/wand_rod_soul.png and b/assets/forbidden/textures/items/wand_rod_soul.png differ diff --git a/assets/forbidden/textures/items/wand_rod_tainted.png b/assets/forbidden/textures/items/wand_rod_tainted.png index 936649d..e02045b 100644 Binary files a/assets/forbidden/textures/items/wand_rod_tainted.png and b/assets/forbidden/textures/items/wand_rod_tainted.png differ diff --git a/assets/forbidden/textures/items/wand_rod_totem.png b/assets/forbidden/textures/items/wand_rod_totem.png new file mode 100644 index 0000000..971eec1 Binary files /dev/null and b/assets/forbidden/textures/items/wand_rod_totem.png differ diff --git a/assets/forbidden/textures/items/wand_rod_witchwood.png b/assets/forbidden/textures/items/wand_rod_witchwood.png index 0c629c6..f36bf41 100644 Binary files a/assets/forbidden/textures/items/wand_rod_witchwood.png and b/assets/forbidden/textures/items/wand_rod_witchwood.png differ diff --git a/assets/forbidden/textures/misc/infernalism.png b/assets/forbidden/textures/misc/infernalism.png deleted file mode 100644 index da80c60..0000000 Binary files a/assets/forbidden/textures/misc/infernalism.png and /dev/null differ diff --git a/assets/forbidden/textures/misc/taintorgan.png b/assets/forbidden/textures/misc/taintorgan.png deleted file mode 100644 index adbbc0d..0000000 Binary files a/assets/forbidden/textures/misc/taintorgan.png and /dev/null differ diff --git a/assets/forbidden/textures/models/wand_cap_manasteel.png b/assets/forbidden/textures/models/wand_cap_manasteel.png new file mode 100644 index 0000000..7f7b499 Binary files /dev/null and b/assets/forbidden/textures/models/wand_cap_manasteel.png differ diff --git a/assets/forbidden/textures/models/wand_rod_livingwood.png b/assets/forbidden/textures/models/wand_rod_livingwood.png new file mode 100644 index 0000000..0ac3f00 Binary files /dev/null and b/assets/forbidden/textures/models/wand_rod_livingwood.png differ diff --git a/assets/forbidden/textures/models/wand_rod_totem.png b/assets/forbidden/textures/models/wand_rod_totem.png new file mode 100644 index 0000000..0a8be45 Binary files /dev/null and b/assets/forbidden/textures/models/wand_rod_totem.png differ diff --git a/assets/forbidden/textures/models/wand_rod_witchwoodhd.png b/assets/forbidden/textures/models/wand_rod_witchwoodhd.png deleted file mode 100644 index dcd1b0d..0000000 Binary files a/assets/forbidden/textures/models/wand_rod_witchwoodhd.png and /dev/null differ diff --git a/src/com/spiteful/forbidden/Compat.java b/src/com/spiteful/forbidden/Compat.java index e8b93bb..bb15151 100644 --- a/src/com/spiteful/forbidden/Compat.java +++ b/src/com/spiteful/forbidden/Compat.java @@ -12,6 +12,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.ThaumcraftApi; @@ -30,6 +31,7 @@ import thaumcraft.api.research.ResearchCategoryList; import thaumcraft.api.research.ResearchItem; import thaumcraft.api.research.ResearchPage; import kihira.playerbeacons.common.PlayerBeacons; +import vazkii.botania.api.BotaniaAPI; public class Compat { @@ -40,12 +42,16 @@ public class Compat { public static boolean pb = false; public static boolean bm = false; public static boolean am2 = false; + public static boolean totes = false; + public static boolean botan = false; + + public static Item fennCrystal; public static void initiate() { if(Loader.isModLoaded("ThaumicTinkerer")) tt = true; - if(Loader.isModLoaded("ThaumicTinkererKami")) + if(tt && Loader.isModLoaded("ThaumicTinkererKami")) kami = true; if(Loader.isModLoaded("ThaumicExploration")) tx = true; @@ -57,6 +63,10 @@ public class Compat { bm = true; if(Loader.isModLoaded("arsmagica2")) am2 = true; + if(Loader.isModLoaded("totemic")) + totes = true; + if(Loader.isModLoaded("Botania")) + botan = true; } public static void compatify() @@ -64,21 +74,35 @@ public class Compat { ItemStack i; AspectList list; - if(tt && kami) + if(tt) { - try { - - Item kamiShards = (Item)(Class.forName("vazkii.tinkerer.common.item.ModItems").getField("kamiResource").get(null)); - list = new AspectList().add(DarkAspects.NETHER, 2).add(Aspect.MAGIC, 1).add(Aspect.CRYSTAL, 1); - ThaumcraftApi.registerObjectTag(kamiShards.itemID, 6, list); - list = new AspectList().add(Aspect.ELDRITCH, 2).add(Aspect.MAGIC, 1).add(Aspect.CRYSTAL, 1); - ThaumcraftApi.registerObjectTag(kamiShards.itemID, 7, list); - - } - catch(Exception e) + if(!kami) { - FMLLog.log(Level.INFO, e, "Forbidden Magic doesn't have Thaumic Tinkerer's nose."); - e.printStackTrace(); + try + { + kami = Class.forName("vazkii.tinkerer.common.core.handler.ConfigHandler").getField("enableKami").getBoolean(null); + } + catch(Exception e){} + } + + if(kami) + { + + try { + + Item kamiShards = (Item)(Class.forName("vazkii.tinkerer.common.item.ModItems").getField("kamiResource").get(null)); + list = new AspectList().add(DarkAspects.NETHER, 2).add(Aspect.MAGIC, 1).add(Aspect.CRYSTAL, 1); + ThaumcraftApi.registerObjectTag(kamiShards.itemID, 6, list); + list = new AspectList().add(Aspect.ELDRITCH, 2).add(Aspect.MAGIC, 1).add(Aspect.CRYSTAL, 1); + ThaumcraftApi.registerObjectTag(kamiShards.itemID, 7, list); + + } + catch(Exception e) + { + FMLLog.log(Level.INFO, e, "Forbidden Magic doesn't have Thaumic Tinkerer's nose."); + e.printStackTrace(); + } + } } @@ -135,7 +159,7 @@ public class Compat { try { InfusionRecipe soul_recipe = ThaumcraftApi.addInfusionCraftingRecipe("ROD_soul", new ItemStack(ForbiddenItems.wandCore, 1, 2), 5, (new AspectList()).add(Aspect.ELDRITCH, 32).add(Aspect.MAGIC, 12).add(Aspect.SOUL, 16), new ItemStack(PlayerBeacons.defiledSoulPylonBlock), new ItemStack[]{ItemApi.getItem("itemResource", 14), new ItemStack(PlayerBeacons.defiledSoulConductorBlock), new ItemStack(PlayerBeacons.defiledSoulConductorBlock), new ItemStack(PlayerBeacons.defiledSoulConductorBlock), new ItemStack(PlayerBeacons.defiledSoulConductorBlock), new ItemStack(Item.eyeOfEnder), new ItemStack(Item.eyeOfEnder)}); - (new DarkResearchItem("ROD_soul", "FORBIDDEN", "[PB]", (new AspectList()).add(Aspect.ELDRITCH, 4).add(Aspect.SOUL, 3).add(Aspect.TOOL, 2), -3, -3, 5, new ItemStack(ForbiddenItems.wandCore, 1, 2))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.ROD_soul.1"), new ResearchPage(soul_recipe)}).setParents(new String[]{"ROD_silverwood", "PB_CRYSTAL"}).setConcealed().registerResearchItem(); + (new DarkResearchItem("ROD_soul", "FORBIDDEN", "[PB]", (new AspectList()).add(Aspect.ELDRITCH, 4).add(Aspect.SOUL, 3).add(Aspect.TOOL, 2), -3, -3, 5, new ItemStack(ForbiddenItems.wandCore, 1, 2))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.ROD_soul.1"), new ResearchPage(soul_recipe)}).setParents(new String[]{"ROD_silverwood", "PB_CRYSTAL", "INFAUXSION"}).setConcealed().registerResearchItem(); IArcaneRecipe soul_cap = ThaumcraftApi.addArcaneCraftingRecipe("CAP_soul", new ItemStack(ForbiddenItems.wandCap, 1, 2), (new AspectList()).add(Aspect.ENTROPY, 20).add(Aspect.FIRE, 5).add(Aspect.WATER, 5).add(Aspect.AIR, 5).add(Aspect.EARTH, 5), new Object[]{"NXN", "N N", Character.valueOf('N'), Item.enderPearl, Character.valueOf('X'), PlayerBeacons.crystalItem}); (new DarkResearchItem("CAP_soul", "FORBIDDEN", "[PB]", (new AspectList()).add(Aspect.ELDRITCH, 3).add(Aspect.MAGIC, 2).add(Aspect.ENTROPY, 4), -3, -5, 3, new ItemStack(ForbiddenItems.wandCap, 1, 2))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.CAP_soul.1"), new ResearchPage(soul_cap)}).setParents(new String[]{"ROD_soul"}).setSecondary().setConcealed().registerResearchItem(); @@ -156,6 +180,7 @@ public class Compat { bloodItems = Class.forName("WayofTime.alchemicalWizardry.ModItems"); Item masterOrb = (Item)(bloodItems.getField("masterBloodOrb").get(null)); + Item archmasterOrb = (Item)(bloodItems.getField("archmageBloodOrb").get(null)); Item imbuedSlate = (Item)(bloodItems.getField("imbuedSlate").get(null)); Item magicales = (Item)(bloodItems.getField("magicales").get(null)); Item aether = (Item)(bloodItems.getField("aether").get(null)); @@ -169,14 +194,36 @@ public class Compat { bloodItems = Class.forName("WayofTime.alchemicalWizardry.AlchemicalWizardry"); Item bloodBucket = (Item)(bloodItems.getField("bucketLife").get(null)); - InfusionRecipe blood_recipe = ThaumcraftApi.addInfusionCraftingRecipe("ROD_blood", new ItemStack(ForbiddenItems.wandCore, 1, 3), 2, (new AspectList()).add(Aspect.LIFE, 32).add(Aspect.MAGIC, 12).add(Aspect.WATER, 16), new ItemStack(masterOrb), new ItemStack[]{new ItemStack(magicales), new ItemStack(imbuedSlate), new ItemStack(imbuedSlate), new ItemStack(tennebrae), new ItemStack(sanctus), new ItemStack(aquasalus), new ItemStack(incendium), new ItemStack(terrae), new ItemStack(aether)}); - (new DarkResearchItem("ROD_blood", "FORBIDDEN", "[BM]", (new AspectList()).add(Aspect.LIFE, 5).add(Aspect.WATER, 4).add(Aspect.WEAPON, 3), -5, -3, 4, new ItemStack(ForbiddenItems.wandCore, 1, 3))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.ROD_blood.1"), new ResearchPage(blood_recipe)}).setParents(new String[]{"ROD_silverwood"}).setAspectTriggers(new Aspect[]{Aspect.LIFE}).setConcealed().registerResearchItem(); + InfusionRecipe blood_recipe = ThaumcraftApi.addInfusionCraftingRecipe("ROD_blood", new ItemStack(ForbiddenItems.wandCore, 1, 6), 2, (new AspectList()).add(Aspect.LIFE, 32).add(Aspect.MAGIC, 12).add(Aspect.WATER, 16), new ItemStack(masterOrb), new ItemStack[]{new ItemStack(magicales), new ItemStack(imbuedSlate), new ItemStack(imbuedSlate), new ItemStack(tennebrae), new ItemStack(sanctus), new ItemStack(aquasalus), new ItemStack(incendium), new ItemStack(terrae), new ItemStack(aether)}); + (new DarkResearchItem("ROD_blood", "FORBIDDEN", "[BM]", (new AspectList()).add(Aspect.LIFE, 5).add(Aspect.WATER, 4).add(Aspect.WEAPON, 3), -5, -3, 3, new ItemStack(ForbiddenItems.wandCore, 1, 3))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.ROD_blood.1"), new ResearchPage(blood_recipe), new ResearchPage("forbidden.research_page.ROD_blood.2")}).setParents(new String[]{"ROD_silverwood", "INFAUXSION"}).setAspectTriggers(new Aspect[]{Aspect.LIFE}).setConcealed().registerResearchItem(); + + Class altar = Class.forName("WayofTime.alchemicalWizardry.common.altarRecipeRegistry.AltarRecipeRegistry"); + Method register = altar.getDeclaredMethod("registerAltarRecipe", new Class[] {ItemStack.class, ItemStack.class, Integer.TYPE, Integer.TYPE, Integer.TYPE, Integer.TYPE, Boolean.TYPE}); + register.invoke(null, new ItemStack(ForbiddenItems.wandCore, 1, 3), new ItemStack(ForbiddenItems.wandCore, 1, 6), 4, 20000, 15, 20, false); InfusionRecipe alchemical_recipe = ThaumcraftApi.addInfusionCraftingRecipe("CAP_alchemical", new ItemStack(ForbiddenItems.wandCap, 1, 0), 3, (new AspectList()).add(Aspect.LIFE, 12).add(Aspect.WATER, 6), ItemApi.getItem("itemWandCap", 1), new ItemStack[]{new ItemStack(magicales), new ItemStack(magicales), new ItemStack(magicales)}); - (new DarkResearchItem("CAP_alchemical", "FORBIDDEN", "[BM]", (new AspectList()).add(Aspect.LIFE, 4).add(Aspect.TOOL, 1).add(Aspect.WATER, 3), -5, -5, 5, new ItemStack(ForbiddenItems.wandCap, 1, 0))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.CAP_alchemical.1"), new ResearchPage(alchemical_recipe)}).setParents(new String[]{"ROD_blood"}).setSecondary().setConcealed().registerResearchItem(); + (new DarkResearchItem("CAP_alchemical", "FORBIDDEN", "[BM]", (new AspectList()).add(Aspect.LIFE, 4).add(Aspect.TOOL, 1).add(Aspect.WATER, 3), -5, -5, 2, new ItemStack(ForbiddenItems.wandCap, 1, 0))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.CAP_alchemical.1"), new ResearchPage(alchemical_recipe)}).setParents(new String[]{"ROD_blood"}).setSecondary().setConcealed().registerResearchItem(); IArcaneRecipe bloodwell_recipe = ThaumcraftApi.addShapelessArcaneCraftingRecipe("BLOODWELL", new ItemStack(ForbiddenItems.bloodwell, 1, 0), (new AspectList()).add(Aspect.WATER, 10).add(Aspect.EARTH, 10), new Object[]{new ItemStack(Item.feather, 1, 0), new ItemStack(bloodBucket, 1, 0), new ItemStack(Item.glassBottle, 1, 0), new ItemStack(crapOrb, 1, 0)}); - (new DarkResearchItem("BLOODWELL", "FORBIDDEN", "[BM]", (new AspectList()).add(Aspect.LIFE, 5).add(Aspect.MIND, 4).add(Aspect.SENSES, 3), -10, 4, 3, new ItemStack(ForbiddenItems.bloodwell, 1, 0))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.BLOODWELL.1"), new ResearchPage(bloodwell_recipe)}).setParents(new String[]{"RESEARCH"}).setAspectTriggers(new Aspect[]{Aspect.LIFE}).setConcealed().registerResearchItem(); + (new DarkResearchItem("BLOODWELL", "FORBIDDEN", "[BM]", (new AspectList()).add(Aspect.LIFE, 5).add(Aspect.MIND, 4).add(Aspect.SENSES, 3), -10, 4, 1, new ItemStack(ForbiddenItems.bloodwell, 1, 0))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.BLOODWELL.1"), new ResearchPage(bloodwell_recipe)}).setParents(new String[]{"RESEARCH"}).setAspectTriggers(new Aspect[]{Aspect.LIFE}).setConcealed().registerResearchItem(); + + if(kami) + { + try { + + Item kamiResource = (Item)(Class.forName("vazkii.tinkerer.common.item.ModItems").getField("kamiResource").get(null)); + + InfusionRecipe divine_orb = ThaumcraftApi.addInfusionCraftingRecipe("DIVINEORB", new ItemStack(ForbiddenItems.bloodOrb, 1, 0), 12, (new AspectList()).add(Aspect.LIFE, 64).add(Aspect.MAGIC, 48).add(Aspect.WATER, 32).add(Aspect.VOID, 64), new ItemStack(archmasterOrb), new ItemStack[]{new ItemStack(kamiResource.itemID, 1, 0), new ItemStack(kamiResource.itemID, 1, 0), new ItemStack(kamiResource.itemID, 1, 0), new ItemStack(kamiResource.itemID, 1, 2), new ItemStack(kamiResource.itemID, 1, 2), new ItemStack(kamiResource.itemID, 1, 1), new ItemStack(kamiResource.itemID, 1, 6), new ItemStack(kamiResource.itemID, 1, 7), new ItemStack(ForbiddenItems.gluttonyShard)}); + (new DarkResearchItem("DIVINEORB", "FORBIDDEN", "[BM]", (new AspectList()).add(Aspect.LIFE, 32).add(Aspect.VOID, 24).add(Aspect.CRYSTAL, 24).add(Aspect.MAGIC, 12), -9, 6, 6, new ItemStack(ForbiddenItems.bloodOrb, 1, 0))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.DIVINEORB.1"), new ResearchPage(divine_orb)}).setParents(new String[]{"ICHOR", "INFAUXSION", "ICHOR_CLOTH", "ICHORIUM"}).setAspectTriggers(new Aspect[]{Aspect.LIFE}).setConcealed().setSpecial().registerResearchItem(); + + } + catch(Exception e) + { + FMLLog.log(Level.INFO, e, "Forbidden Magic doesn't have Thaumic Tinkerer's nose."); + e.printStackTrace(); + } + + } list = (new AspectList()).add(Aspect.LIFE, 2).add(Aspect.MAGIC, 2).add(Aspect.CRYSTAL, 4); ThaumcraftApi.registerObjectTag(crapOrb.itemID, -1, list); @@ -257,10 +304,10 @@ public class Compat { Block witchwood = (Block)(amBlocks.getField("witchwoodLog").get(null)); InfusionRecipe witchwood_recipe = ThaumcraftApi.addInfusionCraftingRecipe("ROD_witchwood", new ItemStack(ForbiddenItems.wandCore, 1, 4), 5, (new AspectList()).add(Aspect.MAGIC, 16).add(Aspect.EARTH, 9).add(Aspect.WATER, 9).add(Aspect.FIRE, 9).add(Aspect.AIR, 9), new ItemStack(witchwood), new ItemStack[]{new ItemStack(amOre.itemID, 1, 3), new ItemStack(essence.itemID, 1, 1), new ItemStack(essence.itemID, 1, 2), new ItemStack(essence.itemID, 1, 3), new ItemStack(essence.itemID, 1, 4), new ItemStack(rune.itemID, 1, 7), new ItemStack(rune.itemID, 1, 8), new ItemStack(amOre.itemID, 1, 2)}); - (new DarkResearchItem("ROD_witchwood", "FORBIDDEN", "[AM2]", (new AspectList()).add(Aspect.MAGIC, 4).add(Aspect.TREE, 5).add(Aspect.MIND, 2), -4, -3, 4, new ItemStack(ForbiddenItems.wandCore, 1, 4))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.ROD_witchwood.1"), new ResearchPage(witchwood_recipe)}).setParents(new String[]{"ROD_silverwood"}).setConcealed().registerResearchItem(); + (new DarkResearchItem("ROD_witchwood", "FORBIDDEN", "[AM2]", (new AspectList()).add(Aspect.MAGIC, 6).add(Aspect.TREE, 5).add(Aspect.MIND, 4), -4, -3, 3, new ItemStack(ForbiddenItems.wandCore, 1, 4))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.ROD_witchwood.1"), new ResearchPage(witchwood_recipe)}).setParents(new String[]{"ROD_silverwood", "INFAUXSION"}).setConcealed().registerResearchItem(); InfusionRecipe vinteum_recipe = ThaumcraftApi.addInfusionCraftingRecipe("CAP_vinteum", new ItemStack(ForbiddenItems.wandCap, 1, 1), 5, (new AspectList()).add(Aspect.ENERGY, 12).add(Aspect.MAGIC, 6), ItemApi.getItem("itemWandCap", 6), new ItemStack[]{new ItemStack(amOre.itemID, 1, 0), new ItemStack(amOre.itemID, 1, 0), new ItemStack(amOre.itemID, 1, 0)}); - (new DarkResearchItem("CAP_vinteum", "FORBIDDEN", "[AM2]", (new AspectList()).add(Aspect.MAGIC, 4).add(Aspect.TOOL, 1).add(Aspect.ENERGY, 2), -4, -5, 5, new ItemStack(ForbiddenItems.wandCap, 1, 1))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.CAP_vinteum.1"), new ResearchPage(vinteum_recipe)}).setParents(new String[]{"ROD_witchwood"}).setSecondary().setConcealed().registerResearchItem(); + (new DarkResearchItem("CAP_vinteum", "FORBIDDEN", "[AM2]", (new AspectList()).add(Aspect.MAGIC, 4).add(Aspect.TOOL, 1).add(Aspect.ENERGY, 2), -4, -5, 1, new ItemStack(ForbiddenItems.wandCap, 1, 1))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.CAP_vinteum.1"), new ResearchPage(vinteum_recipe)}).setParents(new String[]{"ROD_witchwood"}).setSecondary().setConcealed().registerResearchItem(); } catch(Exception e) { @@ -269,6 +316,57 @@ public class Compat { am2 = false; } } + if(totes) + { + try + { + Class totems = Class.forName("totemic_commons.pokefenn.ModItems"); + fennCrystal = (Item)(totems.getField("chlorophyllCrystal").get(null)); + Item fennItems = (Item)(totems.getField("subItems").get(null)); + Class pokeblocks = Class.forName("totemic_commons.pokefenn.ModBlocks"); + Block infusedLog = (Block)(pokeblocks.getField("totemWoods").get(null)); + + IArcaneRecipe totem_rod = ThaumcraftApi.addArcaneCraftingRecipe("ROD_totem", new ItemStack(ForbiddenItems.wandCore, 1, 5), (new AspectList()).add(Aspect.ENTROPY, 10).add(Aspect.FIRE, 10).add(Aspect.WATER, 10).add(Aspect.AIR, 10).add(Aspect.EARTH, 10).add(Aspect.ORDER, 10), new Object[]{"P", "F", "P", Character.valueOf('P'), new ItemStack(infusedLog.blockID, 1, 0), Character.valueOf('F'), new ItemStack(fennItems.itemID, 1, 1)}); + (new DarkResearchItem("ROD_totem", "FORBIDDEN", "[T]", (new AspectList()).add(Aspect.TREE, 8).add(Aspect.MAGIC, 3).add(Aspect.PLANT, 6), -2, -3, 1, new ItemStack(ForbiddenItems.wandCore, 1, 5))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.ROD_totem.1"), new ResearchPage(totem_rod)}).setParents(new String[]{"ROD_greatwood"}).setConcealed().registerResearchItem(); + + + } + catch(Exception e) + { + FMLLog.log(Level.INFO, e, "Forbidden Magic tried to catch Totemic with a pokeball, but didn't weaken it enough."); + e.printStackTrace(); + totes = false; + } + } + if(botan) + { + try + { + Class botanItems = Class.forName("vazkii.botania.common.item.ModItems"); + Item rune = (Item)(botanItems.getField("rune").get(null)); + Item petal = (Item)(botanItems.getField("manaPetal").get(null)); + Item resource = (Item)(botanItems.getField("manaResource").get(null)); + Class blocktania = Class.forName("vazkii.botania.common.block.ModBlocks"); + Block livingLog = (Block)(blocktania.getField("livingwood").get(null)); + + CraftingManager.getInstance().addRecipe(new ItemStack(resource, 1, 0), new Object[]{"###", "###", "###", Character.valueOf('#'), new ItemStack(ForbiddenItems.resource, 1, 2)}); + CraftingManager.getInstance().addRecipe(new ItemStack(ForbiddenItems.resource, 9, 2), new Object[]{"#", Character.valueOf('#'), new ItemStack(resource, 1, 0)}); + + InfusionRecipe livingwood_rod = ThaumcraftApi.addInfusionCraftingRecipe("ROD_livingwood", new ItemStack(ForbiddenItems.wandCore, 1, 8), 3, (new AspectList()).add(Aspect.MAGIC, 16).add(Aspect.TREE, 32).add(Aspect.LIFE, 16).add(Aspect.SENSES, 8).add(Aspect.PLANT, 8), new ItemStack(livingLog), new ItemStack[]{new ItemStack(resource, 1, 2), new ItemStack(rune, 1, 8), new ItemStack(rune, 1, 0), new ItemStack(rune, 1, 1), new ItemStack(rune, 1, 2), new ItemStack(rune, 1, 3), new ItemStack(petal, 1, 0), new ItemStack(petal, 1, 15)}); + (new DarkResearchItem("ROD_livingwood", "FORBIDDEN", "[B]", (new AspectList()).add(Aspect.TREE, 8).add(Aspect.MAGIC, 4).add(Aspect.PLANT, 6), -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[]{"ROD_silverwood", "INFAUXSION"}).setConcealed().registerResearchItem(); + BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ForbiddenItems.wandCore, 1, 7), new ItemStack(ForbiddenItems.wandCore, 1, 8), 10000); + + IArcaneRecipe manasteel_cap = ThaumcraftApi.addArcaneCraftingRecipe("CAP_manasteel", 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'), new ItemStack(ForbiddenItems.resource, 1, 2)}); + (new DarkResearchItem("CAP_manasteel", "FORBIDDEN", "[B]", (new AspectList()).add(Aspect.ELDRITCH, 3).add(Aspect.MAGIC, 2).add(Aspect.ENTROPY, 4), -1, -5, 2, new ItemStack(ForbiddenItems.wandCap, 1, 3))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.CAP_manasteel.1"), new ResearchPage(manasteel_cap)}).setParents(new String[]{"ROD_livingwood"}).setSecondary().setConcealed().registerResearchItem(); + BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ForbiddenItems.wandCap, 1, 3), new ItemStack(ForbiddenItems.wandCap, 1, 4), 1000); + } + catch(Throwable e) + { + FMLLog.log(Level.INFO, e, "Forbidden Magic: Botania? Do you wanna build a snowman?"); + e.printStackTrace(); + botan = false; + } + } } private static void aspectBloodItem(String target, int damage, AspectList list) diff --git a/src/com/spiteful/forbidden/Config.java b/src/com/spiteful/forbidden/Config.java index 9adedd4..03516e4 100644 --- a/src/com/spiteful/forbidden/Config.java +++ b/src/com/spiteful/forbidden/Config.java @@ -44,6 +44,7 @@ public class Config public static int bloodwellID; public static int crystalwellID; public static int ridingCropID; + public static int bloodOrbID; public static int arcaneCakeBlockID; public static int blackFlowerBlockID; @@ -104,6 +105,7 @@ public class Config bloodwellID = conf.getItem("Bloody Scrivener's Tools", idCount++).getInt(); crystalwellID = conf.getItem("Crystal Scribing Tools", idCount++).getInt(); ridingCropID = conf.getItem("Riding Crop", idCount++).getInt(); + bloodOrbID = conf.getItem("Thaumic Blood Orbs", idCount++).getInt(); int blockCount = 3000; arcaneCakeBlockID = conf.getBlock("Thaumic Cake", blockCount++).getInt(); diff --git a/src/com/spiteful/forbidden/Forbidden.java b/src/com/spiteful/forbidden/Forbidden.java index 61eac97..a376003 100644 --- a/src/com/spiteful/forbidden/Forbidden.java +++ b/src/com/spiteful/forbidden/Forbidden.java @@ -6,6 +6,7 @@ import com.spiteful.forbidden.enchantments.DarkEnchantments; import com.spiteful.forbidden.client.ClientProxy; import net.minecraftforge.common.MinecraftForge; +import net.minecraft.block.Block; import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; @@ -24,12 +25,13 @@ import cpw.mods.fml.common.network.NetworkMod; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.wands.WandTriggerRegistry; import java.util.logging.Level; @Mod( modid = "ForbiddenMagic", name = "Forbidden Magic", - version = "0.32", + version = "0.33", dependencies = "required-after:Thaumcraft;after:Natura;after:ThaumicTinkerer;after:ThaumicExploration" ) @NetworkMod( @@ -49,6 +51,7 @@ public class Forbidden serverSide = "com.spiteful.forbidden.CommonProxy" ) public static CommonProxy proxy; + public static WandOverlord wandLord; @EventHandler public void prelude(FMLPreInitializationEvent event) @@ -80,5 +83,9 @@ public class Forbidden ForbiddenRecipes.addRecipes(); ForbiddenResearch.addResearch(); Compat.compatify(); + + wandLord = new WandOverlord(); + WandTriggerRegistry.registerWandBlockTrigger(wandLord, 1, Block.obsidian.blockID, -1); + WandTriggerRegistry.registerWandBlockTrigger(wandLord, 1, Block.netherrack.blockID, -1); } } \ No newline at end of file diff --git a/src/com/spiteful/forbidden/ForbiddenRecipes.java b/src/com/spiteful/forbidden/ForbiddenRecipes.java index 6abfed2..51542cc 100644 --- a/src/com/spiteful/forbidden/ForbiddenRecipes.java +++ b/src/com/spiteful/forbidden/ForbiddenRecipes.java @@ -75,39 +75,39 @@ public class ForbiddenRecipes Iterator i$ = WandCap.caps.keySet().iterator(); - while(i$.hasNext()) { - String captag = (String)i$.next(); - Iterator i$1 = WandRod.rods.keySet().iterator(); + //while(i$.hasNext()) { + // String captag = (String)i$.next(); + // Iterator i$1 = WandRod.rods.keySet().iterator(); - while(i$1.hasNext()) { - String rodtag = (String)i$1.next(); - if((rodtag.equals("tainted") || rodtag.equals("infernal") || rodtag.equals("soul") || rodtag.equals("blood") || rodtag.equals("witchwood") || captag.equals("alchemical") || captag.equals("vinteum")) - && !rodtag.equals("mercurial") && !rodtag.equals("neutronium") && !captag.equals("orichalcum")) - { - int cost = ((WandCap)WandCap.caps.get(captag)).getCraftCost() * ((WandRod)WandRod.rods.get(rodtag)).getCraftCost(); - ItemStack wand = ItemApi.getItem("itemWandCasting", cost); - ((ItemWandCasting)wand.getItem()).setCap(wand, (WandCap)WandCap.caps.get(captag)); - ((ItemWandCasting)wand.getItem()).setRod(wand, (WandRod)WandRod.rods.get(rodtag)); - String key = "WAND_" + captag + "_" + rodtag; - String res = "THAUMIUM"; - if(rodtag.equals("tainted")) - res = "ROD_tainted"; - else if(rodtag.equals("infernal")) - res = "ROD_infernal"; - else if(rodtag.equals("soul")) - res = "ROD_soul"; - else if(rodtag.equals("blood")) - res = "ROD_blood"; - else if(rodtag.equals("witchwood")) - res = "ROD_witchwood"; - else if(captag.equals("alchemical")) - res = "CAP_alchemical"; - else if(captag.equals("vinteum")) - res = "CAP_vinteum"; - ForbiddenResearch.recipes.put(key, ThaumcraftApi.addArcaneCraftingRecipe(res, wand, (new AspectList()).add(Aspect.AIR, cost).add(Aspect.ORDER, cost).add(Aspect.EARTH, cost).add(Aspect.FIRE, cost).add(Aspect.WATER, cost).add(Aspect.ENTROPY, cost), new Object[]{" C", " R ", "C ", Character.valueOf('C'), ((WandCap)WandCap.caps.get(captag)).getItem(), Character.valueOf('R'), ((WandRod)WandRod.rods.get(rodtag)).getItem()})); - } - } - } + // while(i$1.hasNext()) { + // String rodtag = (String)i$1.next(); + // if((rodtag.equals("tainted") || rodtag.equals("infernal") || rodtag.equals("soul") || rodtag.equals("blood") || rodtag.equals("witchwood") || captag.equals("alchemical") || captag.equals("vinteum")) + // && !rodtag.equals("mercurial") && !rodtag.equals("neutronium") && !captag.equals("orichalcum")) + // { + // int cost = ((WandCap)WandCap.caps.get(captag)).getCraftCost() * ((WandRod)WandRod.rods.get(rodtag)).getCraftCost(); + // ItemStack wand = ItemApi.getItem("itemWandCasting", cost); + // ((ItemWandCasting)wand.getItem()).setCap(wand, (WandCap)WandCap.caps.get(captag)); + // ((ItemWandCasting)wand.getItem()).setRod(wand, (WandRod)WandRod.rods.get(rodtag)); + // String key = "WAND_" + captag + "_" + rodtag; + // String res = "THAUMIUM"; + // if(rodtag.equals("tainted")) + // res = "ROD_tainted"; + // else if(rodtag.equals("infernal")) + // res = "ROD_infernal"; + // else if(rodtag.equals("soul")) + // res = "ROD_soul"; + // else if(rodtag.equals("blood")) + // res = "ROD_blood"; + // else if(rodtag.equals("witchwood")) + // res = "ROD_witchwood"; + // else if(captag.equals("alchemical")) + // res = "CAP_alchemical"; + // else if(captag.equals("vinteum")) + // res = "CAP_vinteum"; + // ForbiddenResearch.recipes.put(key, ThaumcraftApi.addArcaneCraftingRecipe(res, wand, (new AspectList()).add(Aspect.AIR, cost).add(Aspect.ORDER, cost).add(Aspect.EARTH, cost).add(Aspect.FIRE, cost).add(Aspect.WATER, cost).add(Aspect.ENTROPY, cost), new Object[]{" C", " R ", "C ", Character.valueOf('C'), ((WandCap)WandCap.caps.get(captag)).getItem(), Character.valueOf('R'), ((WandRod)WandRod.rods.get(rodtag)).getItem()})); + // } + // } + //} } } \ No newline at end of file diff --git a/src/com/spiteful/forbidden/ForbiddenResearch.java b/src/com/spiteful/forbidden/ForbiddenResearch.java index 0463b85..adf8116 100644 --- a/src/com/spiteful/forbidden/ForbiddenResearch.java +++ b/src/com/spiteful/forbidden/ForbiddenResearch.java @@ -7,6 +7,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; +import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -46,14 +47,14 @@ public class ForbiddenResearch if(Config.emeraldTrans) (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("BLACKFLOWER", "FORBIDDEN", (new AspectList()).add(Aspect.PLANT, 3).add(Aspect.SENSES, 2).add(Aspect.DARKNESS, 4), -7, 4, 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 DarkResearchItem("CRYSTALWELL", "FORBIDDEN", (new AspectList()).add(Aspect.MIND, 3).add(Aspect.CRYSTAL, 2).add(Aspect.MAGIC, 1), -9, 4, 3, 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"}).setAspectTriggers(new Aspect[]{Aspect.MIND}).setConcealed().registerResearchItem(); + (new DarkResearchItem("CRYSTALWELL", "FORBIDDEN", (new AspectList()).add(Aspect.MIND, 3).add(Aspect.CRYSTAL, 2).add(Aspect.MAGIC, 1), -9, 4, 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"}).setAspectTriggers(new Aspect[]{Aspect.MIND}).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(); + (new DarkResearchItem("CONSUMING", "FORBIDDEN", (new AspectList()).add(Aspect.VOID, 4).add(Aspect.ENTROPY, 3).add(Aspect.MAGIC, 2), -1, 2, 2, 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, 1, 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, 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[]{"INFAUXSIONENCHANTMENT"}).setSecondary().setConcealed().registerResearchItem(); } @@ -67,16 +68,17 @@ 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("RIDINGCROP", "FORBIDDEN", new AspectList(), -8, -1, 0, new ItemStack(ForbiddenItems.ridingCrop))).setPages(new ResearchPage[] {new ResearchPage("forbidden.research_page.RIDINGCROP.1"), new ResearchPage((IRecipe)recipes.get("RidingCrop"))}).setStub().setAutoUnlock().registerResearchItem(); + (new DarkResearchItem("RIDINGCROP", "FORBIDDEN", new AspectList(), -8, -1, 0, new ItemStack(ForbiddenItems.ridingCrop))).setPages(new ResearchPage[] {new ResearchPage("forbidden.research_page.RIDINGCROP.1"), new ResearchPage((IRecipe)recipes.get("RidingCrop"))}).setStub().setRound().setAutoUnlock().registerResearchItem(); + (new DarkResearchItem("HELLFIRE", "FORBIDDEN", (new AspectList()).add(Aspect.FIRE, 3).add(DarkAspects.NETHER, 4).add(Aspect.TRAVEL, 2), -5, 2, 1, new ItemStack(Block.fire))).setPages(new ResearchPage[] {new ResearchPage("forbidden.research_page.HELLFIRE.1")}).setRound().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("SKULLAXE", "FORBIDDEN", (new AspectList()).add(Aspect.WEAPON, 3).add(DarkAspects.WRATH, 4).add(DarkAspects.NETHER, 1), -8, 1, 2, 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, 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("MORPHTOOLS", "FORBIDDEN", (new AspectList()).add(Aspect.TOOL, 2).add(DarkAspects.ENVY, 3).add(Aspect.EXCHANGE, 2), -5, 5, 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[]{"INFAUXSIONENCHANTMENT"}).setConcealed().registerResearchItem(); + (new DarkResearchItem("ROD_infernal", "FORBIDDEN", (new AspectList()).add(DarkAspects.NETHER, 4).add(Aspect.FIRE, 3).add(Aspect.TOOL, 1), -6, -3, 4, 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, 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(); + (new DarkResearchItem("CORRUPTING", "FORBIDDEN", (new AspectList()).add(DarkAspects.NETHER, 5).add(Aspect.CRYSTAL, 2).add(Aspect.EXCHANGE, 1), -1, 6, 3, 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) @@ -99,8 +101,8 @@ public class ForbiddenResearch } - (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("TAINTSHOVEL", "TAINT", (new AspectList()).add(Aspect.CRYSTAL, 3).add(Aspect.TAINT, 2).add(Aspect.TOOL, 1), 0, -3, 3, 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, 2, 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/WandOverlord.java b/src/com/spiteful/forbidden/WandOverlord.java new file mode 100644 index 0000000..578f666 --- /dev/null +++ b/src/com/spiteful/forbidden/WandOverlord.java @@ -0,0 +1,46 @@ +package com.spiteful.forbidden; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; +import thaumcraft.api.IVisDiscountGear; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.nodes.INode; +import thaumcraft.api.nodes.NodeModifier; +import thaumcraft.api.nodes.NodeType; +import thaumcraft.api.wands.IWandFocus; +import thaumcraft.api.wands.IWandTriggerManager; +import thaumcraft.common.lib.research.ResearchManager; +import thaumcraft.common.items.wands.ItemWandCasting; + +public class WandOverlord implements IWandTriggerManager +{ + public boolean performTrigger(World world, ItemStack wand, EntityPlayer player, int x, int y, int z, int side, int event) + { + if(event == 1 && side == 1) + return hellfire(world, wand, player, x, y, z, side); + return false; + } + + public boolean hellfire(World world, ItemStack wand, EntityPlayer player, int x, int y, int z, int side) + { + if(world.isRemote || wand == null || !(wand.getItem() instanceof ItemWandCasting) || ((ItemWandCasting)wand.getItem()).getFocus(wand) != null + || !ResearchManager.isResearchComplete(player.username, "HELLFIRE") || !player.canPlayerEdit(x, y, z, side, new ItemStack(Item.fireballCharge))) + return false; + + if(world.isAirBlock(x, y + 1, z) && ((ItemWandCasting)wand.getItem()).consumeVis(wand, player, Aspect.FIRE, 2)) + { + world.playSoundEffect((double)x + 0.5D, (double)y + 1.5D, (double)z + 0.5D, "fire.ignite", 1.0F, world.rand.nextFloat() * 0.4F + 0.8F); + world.setBlock(x, y + 1, z, Block.fire.blockID); + player.swingItem(); + return true; + } + else + return false; + } +} \ No newline at end of file diff --git a/src/com/spiteful/forbidden/blocks/BlockWrathCage.java b/src/com/spiteful/forbidden/blocks/BlockWrathCage.java index 8da9b38..eb300c2 100644 --- a/src/com/spiteful/forbidden/blocks/BlockWrathCage.java +++ b/src/com/spiteful/forbidden/blocks/BlockWrathCage.java @@ -51,16 +51,6 @@ public class BlockWrathCage extends BlockContainer return 1; } - /** - * Drops the block items with a specified chance of dropping the specified items - */ - public void dropBlockAsItemWithChance(World par1World, int par2, int par3, int par4, int par5, float par6, int par7) - { - super.dropBlockAsItemWithChance(par1World, par2, par3, par4, par5, par6, par7); - int j1 = 15 + par1World.rand.nextInt(15) + par1World.rand.nextInt(15); - this.dropXpOnBlockBreak(par1World, par2, par3, par4, j1); - } - /** * Called upon block activation (right click on the block.) */ diff --git a/src/com/spiteful/forbidden/items/ForbiddenItems.java b/src/com/spiteful/forbidden/items/ForbiddenItems.java index 6c471e5..4a10130 100644 --- a/src/com/spiteful/forbidden/items/ForbiddenItems.java +++ b/src/com/spiteful/forbidden/items/ForbiddenItems.java @@ -1,6 +1,7 @@ package com.spiteful.forbidden.items; import com.spiteful.forbidden.*; +import com.spiteful.forbidden.items.wands.*; import cpw.mods.fml.common.registry.GameRegistry; import java.util.Arrays; @@ -33,20 +34,25 @@ public class ForbiddenItems public static Item morphSword; public static Item morphShovel; public static Item morphAxe; - public static Item bloodwell; public static Item crystalwell; public static Item ridingCrop; + public static Item bloodwell; + public static Item bloodOrb; + public static WandRod WAND_ROD_TAINTED; public static WandRod WAND_ROD_INFERNAL; public static WandRod WAND_ROD_NEUTRONIUM; public static WandRod WAND_ROD_SOUL; public static WandRod WAND_ROD_BLOOD; public static WandRod WAND_ROD_WITCHWOOD; + public static WandRod WAND_ROD_TOTEM; + public static WandRod WAND_ROD_LIVINGWOOD; public static WandCap WAND_CAP_ORICHALCUM; public static WandCap WAND_CAP_ALCHEMICAL; public static WandCap WAND_CAP_VINTEUM; public static WandCap WAND_CAP_SOUL; + public static WandCap WAND_CAP_MANASTEEL; public static void addItems() { @@ -118,10 +124,13 @@ public class ForbiddenItems WAND_ROD_SOUL.setGlowing(true); WAND_ROD_BLOOD = new WandRod("blood", 100, new ItemStack(wandCore, 1, 3), 12, new BloodWandUpdate(), new ResourceLocation("forbidden", "textures/models/wand_rod_blood.png")); WAND_ROD_WITCHWOOD = new WandRod("witchwood", 100, new ItemStack(wandCore, 1, 4), 12, new ManaWandUpdate(), new ResourceLocation("forbidden", "textures/models/wand_rod_witchwood.png")); + WAND_ROD_TOTEM = new WandRod("totem", 50, new ItemStack(wandCore, 1, 5), 4, new TotemWandUpdate(), new ResourceLocation("forbidden", "textures/models/wand_rod_totem.png")); + WAND_ROD_LIVINGWOOD = new WandRod("livingwood", 100, new ItemStack(wandCore, 1, 7), 12, new YandereWandUpdate(), new ResourceLocation("forbidden", "textures/models/wand_rod_livingwood.png")); WAND_CAP_ORICHALCUM = new DarkWandCap("orichalcum", 0.0F, new ItemStack(Block.commandBlock, 1), 1000, new ResourceLocation("forbidden", "textures/models/wand_cap_orichalcum.png")); - WAND_CAP_ALCHEMICAL = new DarkWandCap("alchemical", 0.95F, Arrays.asList(new Aspect[]{Aspect.WATER}), 0.8F, new ItemStack(wandCap, 1, 0), 7, new ResourceLocation("forbidden", "textures/models/wand_cap_alchemical.png")); - WAND_CAP_VINTEUM = new DarkWandCap("vinteum", 0.9F, new ItemStack(wandCap, 1, 1), 7, new ResourceLocation("forbidden", "textures/models/wand_cap_vinteum.png")); - WAND_CAP_SOUL = new DarkWandCap("soul", 0.95F, Arrays.asList(new Aspect[]{Aspect.ENTROPY}), 0.8F, new ItemStack(wandCap, 1, 2), 7, new ResourceLocation("forbidden", "textures/models/wand_cap_soul.png")); + WAND_CAP_ALCHEMICAL = new DarkWandCap("alchemical", 0.9F, Arrays.asList(new Aspect[]{Aspect.WATER}), 0.8F, new ItemStack(wandCap, 1, 0), 7, new ResourceLocation("forbidden", "textures/models/wand_cap_alchemical.png")); + WAND_CAP_VINTEUM = new DarkWandCap("vinteum", 0.9F, new ItemStack(wandCap, 1, 1), 6, new ResourceLocation("forbidden", "textures/models/wand_cap_vinteum.png")); + WAND_CAP_SOUL = new DarkWandCap("soul", 0.9F, Arrays.asList(new Aspect[]{Aspect.ENTROPY}), 0.8F, new ItemStack(wandCap, 1, 2), 7, new ResourceLocation("forbidden", "textures/models/wand_cap_soul.png")); + WAND_CAP_MANASTEEL = new DarkWandCap("manasteel", 0.9F, new ItemStack(wandCap, 1, 3), 7, new ResourceLocation("forbidden", "textures/models/wand_cap_manasteel.png")); resource = new ItemResource(Config.resourceID).setUnlocalizedName("FMResource"); GameRegistry.registerItem(resource, "FMResource"); @@ -130,8 +139,18 @@ public class ForbiddenItems if(Compat.bm) { - bloodwell = new ItemBloodwell(Config.bloodwellID).setUnlocalizedName("Bloodwell"); - GameRegistry.registerItem(bloodwell, "Bloodwell"); + try + { + bloodwell = new ItemBloodwell(Config.bloodwellID).setUnlocalizedName("Bloodwell"); + GameRegistry.registerItem(bloodwell, "Bloodwell"); + + bloodOrb = new ItemDivineOrb(Config.bloodOrbID).setUnlocalizedName("DivineOrb"); + GameRegistry.registerItem(bloodOrb, "DivineOrb"); + } + catch(Throwable e) + { + e.printStackTrace(); + } } crystalwell = new ItemCrystalwell(Config.crystalwellID).setUnlocalizedName("Crystalwell"); diff --git a/src/com/spiteful/forbidden/items/ItemDivineOrb.java b/src/com/spiteful/forbidden/items/ItemDivineOrb.java new file mode 100644 index 0000000..84658cd --- /dev/null +++ b/src/com/spiteful/forbidden/items/ItemDivineOrb.java @@ -0,0 +1,28 @@ +package com.spiteful.forbidden.items; + +import com.spiteful.forbidden.*; + +import WayofTime.alchemicalWizardry.common.items.EnergyBattery; +import WayofTime.alchemicalWizardry.common.altarRecipeRegistry.AltarRecipeRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.item.ItemStack; + +public class ItemDivineOrb extends EnergyBattery +{ + public ItemDivineOrb(int id) + { + super(id, 50000000); + orbLevel = 5; + setCreativeTab(Forbidden.tab); + AltarRecipeRegistry.registerAltarOrbRecipe(new ItemStack(this),5,140); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IconRegister iconRegister) + { + this.itemIcon = iconRegister.registerIcon("forbidden:divineorb"); + } +} \ No newline at end of file diff --git a/src/com/spiteful/forbidden/items/ItemResource.java b/src/com/spiteful/forbidden/items/ItemResource.java index 424ec0d..ca52f5e 100644 --- a/src/com/spiteful/forbidden/items/ItemResource.java +++ b/src/com/spiteful/forbidden/items/ItemResource.java @@ -32,10 +32,11 @@ public class ItemResource extends Item @SideOnly(Side.CLIENT) public void registerIcons(IconRegister ir) { - icons = new Icon[2]; + icons = new Icon[3]; icons[0] = ir.registerIcon("forbidden:emerald_nugget"); icons[1] = ir.registerIcon("forbidden:dye_powder_black"); + icons[2] = ir.registerIcon("forbidden:nuggetmanasteel"); } @SideOnly(Side.CLIENT) @@ -50,7 +51,7 @@ public class ItemResource extends Item */ public String getUnlocalizedName(ItemStack par1ItemStack) { - int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, 6); + int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, 2); return super.getUnlocalizedName() + "." + i; } @@ -60,7 +61,7 @@ public class ItemResource extends Item */ public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List) { - for (int j = 0; j < 2; ++j) + for (int j = 0; j < 3; ++j) { par3List.add(new ItemStack(par1, 1, j)); } diff --git a/src/com/spiteful/forbidden/items/ItemWandCores.java b/src/com/spiteful/forbidden/items/ItemWandCores.java deleted file mode 100644 index 71a074d..0000000 --- a/src/com/spiteful/forbidden/items/ItemWandCores.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.spiteful.forbidden.items; - -import com.spiteful.forbidden.Forbidden; -import com.spiteful.forbidden.Compat; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import java.util.List; -import net.minecraft.client.renderer.texture.IconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; -import thaumcraft.api.ItemApi; -import thaumcraft.api.wands.WandCap; -import thaumcraft.api.wands.WandRod; -import thaumcraft.common.items.wands.ItemWandCasting; - -public class ItemWandCores extends Item { - - public final String[] types = {"tainted", "infernal", "soul", "blood", "witchwood"}; - public Icon[] icon; - - - public ItemWandCores(int par1) { - super(par1); - this.setMaxStackSize(64); - this.setHasSubtypes(true); - this.setMaxDamage(0); - this.setCreativeTab(Forbidden.tab); - } - - @SideOnly(Side.CLIENT) - public void registerIcons(IconRegister ir) { - icon = new Icon[types.length]; - for(int x = 0; x < types.length; x++) - this.icon[x] = ir.registerIcon("forbidden:wand_rod_" + types[x]); - } - - @SideOnly(Side.CLIENT) - public Icon getIconFromDamage(int meta) { - return this.icon[meta]; - } - - @SideOnly(Side.CLIENT) - public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List) { - for(int x = 0; x < types.length; x++){ - par3List.add(new ItemStack(this, 1, x)); - } - - ItemStack taint = ItemApi.getItem("itemWandCasting", 72); - ((ItemWandCasting)taint.getItem()).setCap(taint, (WandCap)WandCap.caps.get("thaumium")); - ((ItemWandCasting)taint.getItem()).setRod(taint, (WandRod)WandRod.rods.get("tainted")); - par3List.add(taint); - ItemStack infernal = ItemApi.getItem("itemWandCasting", 72); - ((ItemWandCasting)infernal.getItem()).setCap(infernal, (WandCap)WandCap.caps.get("thaumium")); - ((ItemWandCasting)infernal.getItem()).setRod(infernal, (WandRod)WandRod.rods.get("infernal")); - par3List.add(infernal); - ItemStack creative = ItemApi.getItem("itemWandCasting", 2000); - ((ItemWandCasting)creative.getItem()).setCap(creative, (WandCap)WandCap.caps.get("orichalcum")); - ((ItemWandCasting)creative.getItem()).setRod(creative, (WandRod)WandRod.rods.get("neutronium")); - par3List.add(creative); - if(Compat.pb) - { - ItemStack soul = ItemApi.getItem("itemWandCasting", 72); - ((ItemWandCasting)creative.getItem()).setCap(soul, (WandCap)WandCap.caps.get("soul")); - ((ItemWandCasting)creative.getItem()).setRod(soul, (WandRod)WandRod.rods.get("soul")); - par3List.add(soul); - } - if(Compat.bm) - { - ItemStack blood = ItemApi.getItem("itemWandCasting", 72); - ((ItemWandCasting)creative.getItem()).setCap(blood, (WandCap)WandCap.caps.get("alchemical")); - ((ItemWandCasting)creative.getItem()).setRod(blood, (WandRod)WandRod.rods.get("blood")); - par3List.add(blood); - } - if(Compat.am2) - { - ItemStack mana = ItemApi.getItem("itemWandCasting", 72); - ((ItemWandCasting)creative.getItem()).setCap(mana, (WandCap)WandCap.caps.get("vinteum")); - ((ItemWandCasting)creative.getItem()).setRod(mana, (WandRod)WandRod.rods.get("witchwood")); - par3List.add(mana); - } - } - - public String getUnlocalizedName(ItemStack par1ItemStack) { - return super.getUnlocalizedName() + "." + types[par1ItemStack.getItemDamage()]; - } -} diff --git a/src/com/spiteful/forbidden/items/BloodWandUpdate.java b/src/com/spiteful/forbidden/items/wands/BloodWandUpdate.java similarity index 98% rename from src/com/spiteful/forbidden/items/BloodWandUpdate.java rename to src/com/spiteful/forbidden/items/wands/BloodWandUpdate.java index a5d01b4..65801ee 100644 --- a/src/com/spiteful/forbidden/items/BloodWandUpdate.java +++ b/src/com/spiteful/forbidden/items/wands/BloodWandUpdate.java @@ -1,4 +1,4 @@ -package com.spiteful.forbidden.items; +package com.spiteful.forbidden.items.wands; import com.spiteful.forbidden.Config; import com.spiteful.forbidden.Compat; diff --git a/src/com/spiteful/forbidden/items/CreativeWandUpdate.java b/src/com/spiteful/forbidden/items/wands/CreativeWandUpdate.java similarity index 95% rename from src/com/spiteful/forbidden/items/CreativeWandUpdate.java rename to src/com/spiteful/forbidden/items/wands/CreativeWandUpdate.java index 287c98c..92733cc 100644 --- a/src/com/spiteful/forbidden/items/CreativeWandUpdate.java +++ b/src/com/spiteful/forbidden/items/wands/CreativeWandUpdate.java @@ -1,4 +1,4 @@ -package com.spiteful.forbidden.items; +package com.spiteful.forbidden.items.wands; import com.spiteful.forbidden.Config; diff --git a/src/com/spiteful/forbidden/items/DarkWandCap.java b/src/com/spiteful/forbidden/items/wands/DarkWandCap.java similarity index 95% rename from src/com/spiteful/forbidden/items/DarkWandCap.java rename to src/com/spiteful/forbidden/items/wands/DarkWandCap.java index 2f3c7ae..7237acc 100644 --- a/src/com/spiteful/forbidden/items/DarkWandCap.java +++ b/src/com/spiteful/forbidden/items/wands/DarkWandCap.java @@ -1,4 +1,4 @@ -package com.spiteful.forbidden.items; +package com.spiteful.forbidden.items.wands; import java.util.LinkedHashMap; import java.util.List; diff --git a/src/com/spiteful/forbidden/items/InfernalWandUpdate.java b/src/com/spiteful/forbidden/items/wands/InfernalWandUpdate.java similarity index 96% rename from src/com/spiteful/forbidden/items/InfernalWandUpdate.java rename to src/com/spiteful/forbidden/items/wands/InfernalWandUpdate.java index 2344975..22c8fc6 100644 --- a/src/com/spiteful/forbidden/items/InfernalWandUpdate.java +++ b/src/com/spiteful/forbidden/items/wands/InfernalWandUpdate.java @@ -1,4 +1,4 @@ -package com.spiteful.forbidden.items; +package com.spiteful.forbidden.items.wands; import com.spiteful.forbidden.Config; diff --git a/src/com/spiteful/forbidden/items/ItemWandCaps.java b/src/com/spiteful/forbidden/items/wands/ItemWandCaps.java similarity index 91% rename from src/com/spiteful/forbidden/items/ItemWandCaps.java rename to src/com/spiteful/forbidden/items/wands/ItemWandCaps.java index 006e686..0433f9e 100644 --- a/src/com/spiteful/forbidden/items/ItemWandCaps.java +++ b/src/com/spiteful/forbidden/items/wands/ItemWandCaps.java @@ -1,4 +1,4 @@ -package com.spiteful.forbidden.items; +package com.spiteful.forbidden.items.wands; import com.spiteful.forbidden.Forbidden; import com.spiteful.forbidden.Compat; @@ -18,7 +18,7 @@ import thaumcraft.common.items.wands.ItemWandCasting; public class ItemWandCaps extends Item { - public final String[] types = {"alchemical", "vinteum", "soul"}; + public final String[] types = {"alchemical", "vinteum", "soul", "manasteel", "manasteel_inert"}; public Icon[] icon; diff --git a/src/com/spiteful/forbidden/items/wands/ItemWandCores.java b/src/com/spiteful/forbidden/items/wands/ItemWandCores.java new file mode 100644 index 0000000..d6bbdc8 --- /dev/null +++ b/src/com/spiteful/forbidden/items/wands/ItemWandCores.java @@ -0,0 +1,103 @@ +package com.spiteful.forbidden.items.wands; + +import com.spiteful.forbidden.Forbidden; +import com.spiteful.forbidden.Compat; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import thaumcraft.api.ItemApi; +import thaumcraft.api.wands.WandCap; +import thaumcraft.api.wands.WandRod; +import thaumcraft.common.items.wands.ItemWandCasting; + +public class ItemWandCores extends Item { + + public final String[] types = {"tainted", "infernal", "soul", "blood", "witchwood", "totem", "blood_inert", "livingwood", "livingwood_inert"}; + public Icon[] icon; + + + public ItemWandCores(int par1) { + super(par1); + this.setMaxStackSize(64); + this.setHasSubtypes(true); + this.setMaxDamage(0); + this.setCreativeTab(Forbidden.tab); + } + + @SideOnly(Side.CLIENT) + public void registerIcons(IconRegister ir) { + icon = new Icon[types.length]; + for(int x = 0; x < types.length; x++) + this.icon[x] = ir.registerIcon("forbidden:wand_rod_" + types[x]); + } + + @SideOnly(Side.CLIENT) + public Icon getIconFromDamage(int meta) { + return this.icon[meta]; + } + + @SideOnly(Side.CLIENT) + public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List) { + for(int x = 0; x < types.length; x++){ + par3List.add(new ItemStack(this, 1, x)); + } + + ItemStack wand = ItemApi.getItem("itemWandCasting", 72); + ((ItemWandCasting)wand.getItem()).setCap(wand, (WandCap)WandCap.caps.get("thaumium")); + ((ItemWandCasting)wand.getItem()).setRod(wand, (WandRod)WandRod.rods.get("tainted")); + par3List.add(wand); + wand = ItemApi.getItem("itemWandCasting", 72); + ((ItemWandCasting)wand.getItem()).setCap(wand, (WandCap)WandCap.caps.get("thaumium")); + ((ItemWandCasting)wand.getItem()).setRod(wand, (WandRod)WandRod.rods.get("infernal")); + par3List.add(wand); + wand = ItemApi.getItem("itemWandCasting", 2000); + ((ItemWandCasting)wand.getItem()).setCap(wand, (WandCap)WandCap.caps.get("orichalcum")); + ((ItemWandCasting)wand.getItem()).setRod(wand, (WandRod)WandRod.rods.get("neutronium")); + par3List.add(wand); + if(Compat.pb) + { + wand = ItemApi.getItem("itemWandCasting", 84); + ((ItemWandCasting)wand.getItem()).setCap(wand, (WandCap)WandCap.caps.get("soul")); + ((ItemWandCasting)wand.getItem()).setRod(wand, (WandRod)WandRod.rods.get("soul")); + par3List.add(wand); + } + if(Compat.bm) + { + wand = ItemApi.getItem("itemWandCasting", 84); + ((ItemWandCasting)wand.getItem()).setCap(wand, (WandCap)WandCap.caps.get("alchemical")); + ((ItemWandCasting)wand.getItem()).setRod(wand, (WandRod)WandRod.rods.get("blood")); + par3List.add(wand); + } + if(Compat.am2) + { + wand = ItemApi.getItem("itemWandCasting", 72); + ((ItemWandCasting)wand.getItem()).setCap(wand, (WandCap)WandCap.caps.get("vinteum")); + ((ItemWandCasting)wand.getItem()).setRod(wand, (WandRod)WandRod.rods.get("witchwood")); + par3List.add(wand); + } + if(Compat.totes) + { + wand = ItemApi.getItem("itemWandCasting", 24); + ((ItemWandCasting)wand.getItem()).setCap(wand, (WandCap)WandCap.caps.get("thaumium")); + ((ItemWandCasting)wand.getItem()).setRod(wand, (WandRod)WandRod.rods.get("totem")); + par3List.add(wand); + } + if(Compat.botan) + { + wand = ItemApi.getItem("itemWandCasting", 84); + ((ItemWandCasting)wand.getItem()).setCap(wand, (WandCap)WandCap.caps.get("manasteel")); + ((ItemWandCasting)wand.getItem()).setRod(wand, (WandRod)WandRod.rods.get("livingwood")); + par3List.add(wand); + } + } + + public String getUnlocalizedName(ItemStack par1ItemStack) { + return super.getUnlocalizedName() + "." + types[par1ItemStack.getItemDamage()]; + } +} diff --git a/src/com/spiteful/forbidden/items/ManaWandUpdate.java b/src/com/spiteful/forbidden/items/wands/ManaWandUpdate.java similarity index 96% rename from src/com/spiteful/forbidden/items/ManaWandUpdate.java rename to src/com/spiteful/forbidden/items/wands/ManaWandUpdate.java index 46b4fba..f7d336e 100644 --- a/src/com/spiteful/forbidden/items/ManaWandUpdate.java +++ b/src/com/spiteful/forbidden/items/wands/ManaWandUpdate.java @@ -1,4 +1,4 @@ -package com.spiteful.forbidden.items; +package com.spiteful.forbidden.items.wands; import com.spiteful.forbidden.Config; import com.spiteful.forbidden.Compat; diff --git a/src/com/spiteful/forbidden/items/SoulWandUpdate.java b/src/com/spiteful/forbidden/items/wands/SoulWandUpdate.java similarity index 98% rename from src/com/spiteful/forbidden/items/SoulWandUpdate.java rename to src/com/spiteful/forbidden/items/wands/SoulWandUpdate.java index 7d605b1..2d08edc 100644 --- a/src/com/spiteful/forbidden/items/SoulWandUpdate.java +++ b/src/com/spiteful/forbidden/items/wands/SoulWandUpdate.java @@ -1,4 +1,4 @@ -package com.spiteful.forbidden.items; +package com.spiteful.forbidden.items.wands; import com.spiteful.forbidden.Config; import com.spiteful.forbidden.Compat; diff --git a/src/com/spiteful/forbidden/items/TaintedWandUpdate.java b/src/com/spiteful/forbidden/items/wands/TaintedWandUpdate.java similarity index 95% rename from src/com/spiteful/forbidden/items/TaintedWandUpdate.java rename to src/com/spiteful/forbidden/items/wands/TaintedWandUpdate.java index e540f94..8d45e14 100644 --- a/src/com/spiteful/forbidden/items/TaintedWandUpdate.java +++ b/src/com/spiteful/forbidden/items/wands/TaintedWandUpdate.java @@ -1,4 +1,4 @@ -package com.spiteful.forbidden.items; +package com.spiteful.forbidden.items.wands; import com.spiteful.forbidden.Config; diff --git a/src/com/spiteful/forbidden/items/wands/TotemWandUpdate.java b/src/com/spiteful/forbidden/items/wands/TotemWandUpdate.java new file mode 100644 index 0000000..5416958 --- /dev/null +++ b/src/com/spiteful/forbidden/items/wands/TotemWandUpdate.java @@ -0,0 +1,59 @@ +package com.spiteful.forbidden.items.wands; + +import com.spiteful.forbidden.Config; +import com.spiteful.forbidden.Compat; + +import java.util.ArrayList; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.wands.IWandRodOnUpdate; +import thaumcraft.common.items.wands.ItemWandCasting; + +public class TotemWandUpdate implements IWandRodOnUpdate { + + Aspect primals[] = Aspect.getPrimalAspects().toArray(new Aspect[0]); + + public void onUpdate(ItemStack itemstack, EntityPlayer player) + { + if(Compat.totes && Compat.fennCrystal != null && player.ticksExisted % 30 == 0) + { + try + { + ArrayList unfilled = new ArrayList(); + for(int x = 0;x < primals.length;x++) + { + if(((ItemWandCasting)itemstack.getItem()).getVis(itemstack, primals[x]) < ((ItemWandCasting)itemstack.getItem()).getMaxVis(itemstack)) + { + unfilled.add(primals[x]); + } + } + if(unfilled.size() > 0 && siphonPlant(player)) + ((ItemWandCasting)itemstack.getItem()).addVis(itemstack, (Aspect)(unfilled.get(player.worldObj.rand.nextInt(unfilled.size()))), 1, true); + + } + catch(Exception e) + { + return; + } + } + + } + + public boolean siphonPlant(EntityPlayer player) + { + for(int x = 0; x < player.inventory.getSizeInventory(); ++x) + { + ItemStack item = player.inventory.getStackInSlot(x); + if(item != null && item.itemID == Compat.fennCrystal.itemID) + { + if(item.getItemDamage() <= 995) + { + item.setItemDamage(item.getItemDamage() + 5); + return true; + } + } + } + return false; + } +} diff --git a/src/com/spiteful/forbidden/items/wands/YandereWandUpdate.java b/src/com/spiteful/forbidden/items/wands/YandereWandUpdate.java new file mode 100644 index 0000000..1ac7cac --- /dev/null +++ b/src/com/spiteful/forbidden/items/wands/YandereWandUpdate.java @@ -0,0 +1,50 @@ +package com.spiteful.forbidden.items.wands; + +import com.spiteful.forbidden.Config; +import com.spiteful.forbidden.Compat; + +import java.util.ArrayList; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.wands.IWandRodOnUpdate; +import thaumcraft.common.items.wands.ItemWandCasting; +import vazkii.botania.api.mana.ManaItemHandler; + +public class YandereWandUpdate implements IWandRodOnUpdate { + + Aspect primals[] = Aspect.getPrimalAspects().toArray(new Aspect[0]); + + public void onUpdate(ItemStack itemstack, EntityPlayer player) + { + if(Compat.botan && player.ticksExisted % 30 == 0) + { + try + { + int cost; + if(((ItemWandCasting)itemstack.getItem()).getCap(itemstack).getTag().equals("manasteel")) + cost = 600; + else + cost = 800; + + ArrayList unfilled = new ArrayList(); + for(int x = 0;x < primals.length;x++) + { + if(((ItemWandCasting)itemstack.getItem()).getVis(itemstack, primals[x]) < ((ItemWandCasting)itemstack.getItem()).getMaxVis(itemstack)) + { + unfilled.add(primals[x]); + } + } + if(unfilled.size() > 0 && ManaItemHandler.requestManaExact(itemstack, player, cost, true)) + ((ItemWandCasting)itemstack.getItem()).addVis(itemstack, (Aspect)(unfilled.get(player.worldObj.rand.nextInt(unfilled.size()))), 1, true); + + } + catch(Throwable e) + { + return; + } + } + + } + +} diff --git a/src/mcmod.info b/src/mcmod.info index 9a16b94..dd54896 100644 --- a/src/mcmod.info +++ b/src/mcmod.info @@ -2,7 +2,7 @@ { "modid" : "ForbiddenMagic", "name" : "Forbidden Magic", - "version" : "v0.32", + "version" : "v0.33", "url" : "http://www.minecraftforum.net/topic/2305054-/", "credits" : "Azanor, Flaxbeard, Killajoke, LycaonX, Nieue, Succubism, Vazkii", "authors": [