Dropping the mike

Final content commit.  Fixing aspect derps, removing Taint tab and
adding Blood Staff.
This commit is contained in:
Jeremy Diamond committed 2014-04-03 18:57:33 -07:00
1 parent 9e212a9a90
commit 0b3e7a73a4
14 files changed
+203 -35

No files matched your search

+14 -3
View File
@@ -62,6 +62,7 @@ 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.WandCores.blood_staff.name=Blood Staff Core
item.WandCaps.alchemical.name=Alchemical Cap
item.WandCaps.vinteum.name=Vinteum Cap
item.WandCaps.soul.name=Ender Cap
@@ -72,6 +73,7 @@ item.WandCaps.manasteel_inert.name=Inert Manasteel Cap
tile.ArcaneCake.name=Thaumic Cake
tile.InkFlower.name=Umbral Rose
tile.WrathCage.name=Wrath Cage
tile.StarBlock.name=Nether Star Block
#
# Enchantments
enchantment.cluster=Fiery Core
@@ -80,6 +82,7 @@ enchantment.greedy=Capitalist
enchantment.consuming=Consuming
enchantment.educational=Educational
enchantment.corrupting=Corrupting
enchantment.eternal=Eternal
#
# Misc
itemGroup.forbidden=Forbidden Magic
@@ -130,17 +133,21 @@ 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.<BR><BR>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_blood_staff=Blood Staff Core
forbidden.research_text.ROD_blood_staff=Staff of the Blood Magus
forbidden.research_page.ROD_blood_staff.1=The Blood Wand is useful, but it just charges so slowly. It's time to create a magical implement that can hold up in sustained combat.<BR><BR>Unlike most staves, the Blood Staff holds only 50 vis instead of the 100 its wand form can. Where it truly shines is its ability to recharge vis at a rapid rate. As long as the Blood Staff is held in your hotbar, it will recharge its vis from its owner's LP network four times as quickly as a normal Blood Wand. This voraciousness comes at a price, however. Unlike the wand, the Blood Staff can and will kill whoever's holding it if it doesn't recieve enough LP.
#
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.<BR><BR>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...<BR><BR>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_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...<BR><BR>By carving a wand core from Infused Wood, you create a wand that can draw power from plant life. 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.<BR><BR>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.<BR><BR>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_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.<BR><BR>The Livingwood Wand will quickly draw mana from storage items in your inventory in order to charge itself.<BR><BR>The infusion process burns the livingwood out, unfortunately. Once infused, the wand rod must be charged in a mana pool in order to be re-awakened.
#
forbidden.research_name.CAP_alchemical=Alchemical Caps
forbidden.research_text.CAP_alchemical=When Thaumium isn't bloody enough
@@ -156,7 +163,7 @@ forbidden.research_page.CAP_soul.1=You've created a wand cap that can safely cha
#
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.<BR><BR>In order to be used in the creation of a wand, the Inert Manasteel Caps must be infused in a Mana Pool.
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 also makes the mana conversion process more efficient.<BR><BR>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
@@ -205,6 +212,10 @@ forbidden.research_name.CORRUPTING=Enchantment: Corrupting
forbidden.research_text.CORRUPTING=A bad influence on shards
forbidden.research_page.CORRUPTING.1=The Nether is great and all, but it's also kind of a... Hell Hole.<BR><BR>The Corrupting enchant allows you to harvest Nether Shards without having to be in the Nether. A pickaxe enchanted with Corrupting will randomly corrupt harvested elemental shards, changing them into nether shards. The shards only seem susceptible while they are encased in infused stone, so corrupting a shard cluster will have no effect.
#
forbidden.research_name.ETERNAL=Enchantment: Eternal
forbidden.research_text.ETERNAL=Chameleon Gods
forbidden.research_page.ETERNAL.1=Ichorium Tools are really great. You sure wish your Chameleon Tools could be more like them. Maybe they can...<BR><BR>The Eternal enchant gives a Chameleon Tool the same unbreakable quality as Ichorium Tools.
#
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.
Binary file not shown.

After

Width:  |  Height:  |  Size: 683 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 357 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 722 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 385 KiB

+7
View File
@@ -195,6 +195,7 @@ public class Compat {
Item sanctus = (Item)(bloodItems.getField("sanctus").get(null));
Item tennebrae = (Item)(bloodItems.getField("tennebrae").get(null));
Item crapOrb = (Item)(bloodItems.getField("weakBloodOrb").get(null));
Item demonShard = (Item)(bloodItems.getField("demonBloodShard").get(null));
bloodItems = Class.forName("WayofTime.alchemicalWizardry.AlchemicalWizardry");
Item bloodBucket = (Item)(bloodItems.getField("bucketLife").get(null));
@@ -212,6 +213,9 @@ public class Compat {
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, 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();
IArcaneRecipe blood_staff = ThaumcraftApi.addArcaneCraftingRecipe("ROD_blood_staff", new ItemStack(ForbiddenItems.wandCore, 1, 9), (new AspectList()).add(Aspect.ENTROPY, 26).add(Aspect.FIRE, 26).add(Aspect.WATER, 26).add(Aspect.AIR, 26).add(Aspect.EARTH, 26).add(Aspect.ORDER, 26), new Object[]{"__D", "_B_", "B__", Character.valueOf('B'), new ItemStack(ForbiddenItems.wandCore, 1, 3), Character.valueOf('D'), new ItemStack(demonShard)});
(new DarkResearchItem("ROD_blood_staff", "FORBIDDEN", "[BM]", (new AspectList()).add(Aspect.LIFE, 8).add(Aspect.WATER, 7).add(Aspect.WEAPON, 6), -6, -5, 5, new ItemStack(ForbiddenItems.wandCore, 1, 9))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.ROD_blood_staff.1"), new ResearchPage(blood_staff)}).setParents(new String[]{"ROD_silverwood_staff", "ROD_blood"}).setSpecial().setConcealed().registerResearchItem();
if(kami)
{
try {
@@ -242,6 +246,9 @@ public class Compat {
list = (new AspectList()).add(Aspect.LIFE, 16).add(Aspect.MAGIC, 8).add(Aspect.CRYSTAL, 4);
ThaumcraftApi.registerObjectTag(masterOrb.itemID, -1, list);
list = (new AspectList()).add(Aspect.LIFE, 16).add(DarkAspects.NETHER, 8).add(Aspect.CRYSTAL, 4).add(Aspect.FIRE, 1).add(Aspect.WATER, 1).add(Aspect.AIR, 1).add(Aspect.EARTH, 1).add(Aspect.LIGHT, 1).add(Aspect.DARKNESS, 1);
ThaumcraftApi.registerObjectTag(demonShard.itemID, -1, list);
list = (new AspectList()).add(Aspect.LIFE, 32).add(DarkAspects.NETHER, 4).add(Aspect.MAGIC, 8).add(Aspect.CRYSTAL, 4);
aspectBloodItem("archmageBloodOrb", -1, list);
+31 -20
View File
@@ -23,6 +23,10 @@ public class DarkAspects
public static Aspect PRIDE;
public static Aspect LUST;
public static Aspect SLOTH;
public static Aspect DINO;
public static Aspect FISH;
public static Aspect DERP;
public static void initAspects()
{
@@ -35,6 +39,7 @@ public class DarkAspects
ENVY = new Aspect("invidia", 0x00ba00, new Aspect[] {Aspect.SENSES, Aspect.HUNGER}, new ResourceLocation("forbidden", "textures/aspects/invidia.png"), 1);
SLOTH = new Aspect("desidia", 0x6e6e6e, new Aspect[] {Aspect.TRAP, Aspect.SOUL}, new ResourceLocation("forbidden", "textures/aspects/desidia.png"), 771);
WRATH = new Aspect("ira", 0x870404, new Aspect[] {Aspect.WEAPON, Aspect.FIRE}, new ResourceLocation("forbidden", "textures/aspects/ira.png"), 771);
}
public static void addAspects()
@@ -49,21 +54,26 @@ public class DarkAspects
list.add(NETHER, 4);
ThaumcraftApi.registerObjectTag(Block.portal.blockID, -1, list);
list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(Block.oreNetherQuartz));
list.add(NETHER, 2);
ThaumcraftApi.registerObjectTag(Block.oreNetherQuartz.blockID, -1, list);
//list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(Block.oreNetherQuartz));
//list.add(NETHER, 2);
//ThaumcraftApi.registerObjectTag(Block.oreNetherQuartz.blockID, -1, list);
ThaumcraftApi.registerObjectTag("oreQuartz", (new AspectList()).add(Aspect.STONE, 1).add(Aspect.CRYSTAL, 3).add(NETHER, 2));
list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(Item.netherStar)).copy();
list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(Item.netherStar));
list.add(NETHER, 8).add(PRIDE, 8);
ThaumcraftApi.registerObjectTag(Item.netherStar.itemID, -1, list);
ThaumcraftApi.registerObjectTag(Item.netherStar.itemID, 0, list);
list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(Item.netherStalkSeeds));
list.add(NETHER, 1);
ThaumcraftApi.registerObjectTag(Item.netherStalkSeeds.itemID, -1, list);
ThaumcraftApi.registerObjectTag(Item.netherStalkSeeds.itemID, 0, list);
list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(Item.netherrackBrick));
list.add(NETHER, 1);
ThaumcraftApi.registerObjectTag(Item.netherrackBrick.itemID, -1, list);
list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(Block.netherBrick));
list.add(NETHER, 2);
ThaumcraftApi.registerObjectTag(Block.netherBrick.blockID, 0, list);
list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(Item.ghastTear));
list.add(WRATH, 4);
@@ -77,17 +87,13 @@ public class DarkAspects
list.add(WRATH, 2);
ThaumcraftApi.registerObjectTag(Item.skull.itemID, 4, list);
list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(Item.enderPearl));
list.add(PRIDE, 1);
ThaumcraftApi.registerObjectTag(Item.enderPearl.itemID, -1, list);
//list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(Block.slowSand));
//list.add(NETHER, 1);
//ThaumcraftApi.registerObjectTag(Block.slowSand.blockID, -1, list);
//list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(Item.enderPearl));
//list.add(PRIDE, 1);
//ThaumcraftApi.registerObjectTag(Item.enderPearl.itemID, -1, list);
list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(Block.tnt));
list.add(WRATH, 2);
ThaumcraftApi.registerObjectTag(Block.tnt.blockID, -1, list);
ThaumcraftApi.registerObjectTag(Block.tnt.blockID, 0, list);
list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(Item.helmetGold));
list.add(PRIDE, 2);
@@ -115,13 +121,15 @@ public class DarkAspects
list = (new AspectList()).add(Aspect.CRAFT, 3).add(Aspect.CLOTH, 6).add(SLOTH, 4);
ThaumcraftApi.registerObjectTag(Item.bed.itemID, -1, list);
list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(Item.eyeOfEnder)).copy();
//list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(Item.eyeOfEnder)).copy();
list = (new AspectList()).add(Aspect.SENSES, 4).add(Aspect.ELDRITCH, 4).add(Aspect.MAGIC, 3);
list.add(ENVY, 4);
ThaumcraftApi.registerObjectTag(Item.eyeOfEnder.itemID, -1, list);
ThaumcraftApi.registerObjectTag(Item.eyeOfEnder.itemID, 0, list);
//ThaumcraftApi.registerComplexObjectTag(Item.eyeOfEnder.itemID, 0, (new AspectList()).add(Aspect.SENSES, 4).add(ENVY, 86));
list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(Item.cake));
list.add(GLUTTONY, 7);
ThaumcraftApi.registerObjectTag(Item.cake.itemID, -1, list);
ThaumcraftApi.registerObjectTag(Item.cake.itemID, 0, list);
list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(Item.cookie));
list.add(GLUTTONY, 1);
@@ -129,11 +137,14 @@ public class DarkAspects
list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(Item.fireballCharge));
list.add(WRATH, 1);
ThaumcraftApi.registerObjectTag(Item.fireballCharge.itemID, -1, list);
ThaumcraftApi.registerObjectTag(Item.fireballCharge.itemID, 0, list);
list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(Item.comparator)).copy();
list.add(ENVY, 1);
//list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(Item.comparator)).copy();
//list.add(ENVY, 2);
list = (new AspectList()).add(Aspect.MECHANISM, 2).add(Aspect.ORDER, 2).add(ENVY, 2);
ThaumcraftApi.registerObjectTag(Item.comparator.itemID, -1, list);
//ThaumcraftApi.registerComplexObjectTag(Block.redstoneComparatorIdle.blockID, -1, (new AspectList()).merge(Aspect.MECHANISM, 2).merge(Aspect.ORDER, 2).merge(ENVY, 2));
//ThaumcraftApi.registerComplexObjectTag(Block.redstoneComparatorActive.blockID, -1, (new AspectList()).merge(Aspect.MECHANISM, 2).merge(Aspect.ORDER, 2).merge(ENVY, 2));
list = (new AspectList()).add(Aspect.FLESH, 6).add(Aspect.LIFE, 6).add(Aspect.ENERGY, 6).add(Aspect.BEAST, 4).add(GLUTTONY, 6);
ThaumcraftApi.registerObjectTag("itemBacon", list);
@@ -91,15 +91,8 @@ public class ForbiddenResearch
public static void addTaint()
{
if(!ResearchCategories.researchCategories.containsKey("TAINT"))
{
ResearchCategories.registerCategory("TAINT", new ResourceLocation("forbidden", "textures/misc/henturgy.png"), new ResourceLocation("forbidden", "textures/misc/taintBackground.png"));
(new DarkResearchItem("TAINTBASICS", "TAINT", new AspectList(), 0, 0, 0, ItemApi.getItem("itemResource", 12))).setPages(new ResearchPage[] {new ResearchPage("forbidden.research_page.TAINTBASICS.1"), new ResearchPage("forbidden.research_page.TAINTBASICS.2")}).setStub().setRound().setAutoUnlock().registerResearchItem();
}
(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();
(new DarkResearchItem("TAINTSHOVEL", "FORBIDDEN", (new AspectList()).add(Aspect.CRYSTAL, 3).add(Aspect.TAINT, 2).add(Aspect.TOOL, 1), -7, 0, 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")}).setParents(new String[]{"THAUMIUM", "INFAUXSION", "ETHEREALBLOOM"}).setConcealed().registerResearchItem();
(new DarkResearchItem("TAINTPICK", "FORBIDDEN", (new AspectList()).add(Aspect.TOOL, 2).add(Aspect.TAINT, 4).add(Aspect.ENTROPY, 3), -8, 0, 2, new ItemStack(ForbiddenItems.taintPickaxe))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.TAINTPICK.1"), new ResearchPage((InfusionRecipe)recipes.get("TaintPick"))}).setParents(new String[]{"THAUMIUM", "INFAUXSION"}).setConcealed().registerResearchItem();
(new DarkResearchItem("ROD_tainted", "FORBIDDEN", (new AspectList()).add(Aspect.MAGIC, 4).add(Aspect.TAINT, 5).add(Aspect.TOOL, 2), -7, -3, 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", "INFAUXSION"}).setConcealed().registerResearchItem();
}
}
@@ -0,0 +1,43 @@
package com.spiteful.forbidden.blocks;
import com.spiteful.forbidden.items.ForbiddenItems;
import com.spiteful.forbidden.*;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.Icon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
public class BlockResource extends Block
{
public BlockResource(int par1)
{
super(par1, Material.iron);
this.setCreativeTab(Forbidden.tab);
}
/**
* Determines if this block can be used as the base of a beacon.
*
* @param world The current world
* @param x X Position
* @param y Y Position
* @param z Z position
* @param beaconX Beacons X Position
* @param beaconY Beacons Y Position
* @param beaconZ Beacons Z Position
* @return True, to support the beacon, and make it active with this block.
*/
public boolean isBeaconBase(World worldObj, int x, int y, int z, int beaconX, int beaconY, int beaconZ)
{
return true;
}
}
@@ -30,7 +30,7 @@ public class ForbiddenBlocks
GameRegistry.registerTileEntity(TileEntityWrathCage.class, "WrathCage");
blackFlower = new BlockBlackFlower(Config.blackFlowerBlockID).setStepSound(Block.soundGrassFootstep).setTextureName("forbidden:flower_black").setUnlocalizedName("InkFlower");
GameRegistry.registerBlock(blackFlower, "InkFlower");
starBlock = new Block(Config.starBlockID, Material.rock).setHardness(5.0F).setStepSound(Block.soundMetalFootstep).setTextureName("forbidden:starblock").setUnlocalizedName("StarBlock");
starBlock = new BlockResource(Config.starBlockID).setHardness(5.0F).setStepSound(Block.soundMetalFootstep).setTextureName("forbidden:starblock").setUnlocalizedName("StarBlock");
GameRegistry.registerBlock(starBlock, "StarBlock");
}
}
@@ -16,6 +16,7 @@ import thaumcraft.api.ThaumcraftApi;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.wands.WandCap;
import thaumcraft.api.wands.WandRod;
import thaumcraft.api.wands.StaffRod;
public class ForbiddenItems
{
@@ -48,6 +49,7 @@ public class ForbiddenItems
public static WandRod WAND_ROD_WITCHWOOD;
public static WandRod WAND_ROD_TOTEM;
public static WandRod WAND_ROD_LIVINGWOOD;
public static StaffRod STAFF_ROD_BLOOD;
public static WandCap WAND_CAP_ORICHALCUM;
public static WandCap WAND_CAP_ALCHEMICAL;
public static WandCap WAND_CAP_VINTEUM;
@@ -124,6 +126,7 @@ public class ForbiddenItems
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"));
STAFF_ROD_BLOOD = new StaffRod("blood", 50, new ItemStack(wandCore, 1, 9), 24, new BloodStaffUpdate(), new ResourceLocation("forbidden", "textures/models/wand_rod_blood.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.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"));
@@ -0,0 +1,100 @@
package com.spiteful.forbidden.items.wands;
import com.spiteful.forbidden.Config;
import com.spiteful.forbidden.Compat;
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 java.lang.reflect.Field;
import java.lang.reflect.Method;
//import WayofTime.alchemicalWizardry.common.EnergyItems;
public class BloodStaffUpdate implements IWandRodOnUpdate {
Aspect primals[] = Aspect.getPrimalAspects().toArray(new Aspect[0]);
Method checkOwner;
Method syphon;
public BloodStaffUpdate()
{
try
{
Class energyItems;
energyItems = Class.forName("WayofTime.alchemicalWizardry.common.items.EnergyItems");
checkOwner = energyItems.getDeclaredMethod("checkAndSetItemOwner", new Class[] {ItemStack.class, EntityPlayer.class});
syphon = energyItems.getDeclaredMethod("syphonWhileInContainer", new Class[] {ItemStack.class, Integer.TYPE});
}
catch(Exception e){
e.printStackTrace(); }
}
public void onUpdate(ItemStack itemstack, EntityPlayer player)
{
if(Compat.bm && player.ticksExisted % 25 == 0)
{
try
{
if(!checkHotbar(itemstack, player))
return;
checkOwner.invoke(null, itemstack, player);
int cost;
if(((ItemWandCasting)itemstack.getItem()).getCap(itemstack).getTag().equals("alchemical"))
cost = 900;
else
cost = 1000;
for(int x = 0;x < primals.length;x++)
{
if(((ItemWandCasting)itemstack.getItem()).getVis(itemstack, primals[x]) < ((ItemWandCasting)itemstack.getItem()).getMaxVis(itemstack))
{
if(player.capabilities.isCreativeMode)
((ItemWandCasting)itemstack.getItem()).addVis(itemstack, primals[x], 1, true);
else if(((Boolean)(syphon.invoke(null, itemstack, cost))).booleanValue())
((ItemWandCasting)itemstack.getItem()).addVis(itemstack, primals[x], 1, true);
else if(syphonHealth(player))
{
((ItemWandCasting)itemstack.getItem()).addVis(itemstack, primals[x], 1, true);
return;
}
else
return;
}
}
}
catch(Exception e)
{
return;
}
}
}
public boolean syphonHealth(EntityPlayer player)
{
if(player.getHealth() > 1)
{
player.setHealth(player.getHealth() - 3);
return true;
}
else
return false;
}
private boolean checkHotbar(ItemStack stack, EntityPlayer player)
{
for(int x = 0; x < 9; ++x)
{
ItemStack item = player.inventory.getStackInSlot(x);
if(item == stack)
return true;
}
return false;
}
}
@@ -18,7 +18,7 @@ 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 final String[] types = {"tainted", "infernal", "soul", "blood", "witchwood", "totem", "blood_inert", "livingwood", "livingwood_inert", "blood_staff"};
public Icon[] icon;