diff --git a/assets/forbidden/lang/en_US.lang b/assets/forbidden/lang/en_US.lang index d9de5bd..62eba51 100644 --- a/assets/forbidden/lang/en_US.lang +++ b/assets/forbidden/lang/en_US.lang @@ -35,6 +35,7 @@ item.DiabolistSpork.name=Spork of Doom item.GluttonyShard.name=Gluttony Shard item.Bloodwell.name=Bloody Scrivener's Tools item.Crystalwell.name=Crystal Scribing Tools +item.RidingCrop.name=Riding Crop # # Wand components item.Wand.tainted.rod=Tainted @@ -192,4 +193,8 @@ forbidden.research_page.BLOODWELL.1=There's nothing more frustrating than having 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. +# +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? # \ No newline at end of file diff --git a/assets/forbidden/textures/items/crop.png b/assets/forbidden/textures/items/crop.png new file mode 100644 index 0000000..e75816b Binary files /dev/null and b/assets/forbidden/textures/items/crop.png differ diff --git a/src/com/spiteful/forbidden/DarkAspects.java b/src/com/spiteful/forbidden/DarkAspects.java index 01edafe..1dfb2b6 100644 --- a/src/com/spiteful/forbidden/DarkAspects.java +++ b/src/com/spiteful/forbidden/DarkAspects.java @@ -115,12 +115,11 @@ public class DarkAspects list.add(PRIDE, 2); ThaumcraftApi.registerObjectTag(Item.swordGold.itemID, -1, list); - list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(Item.bed)); - list.add(SLOTH, 4); - if(!Config.noLust) - list.add(LUST, 1); + //list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(Item.bed)); + //list.add(SLOTH, 4); + 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)); list.add(ENVY, 4); ThaumcraftApi.registerObjectTag(Item.eyeOfEnder.itemID, -1, list); @@ -149,6 +148,11 @@ public class DarkAspects list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(Item.saddle)); list.add(LUST, 2); ThaumcraftApi.registerObjectTag(Item.saddle.itemID, -1, list); + + //list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(Item.leash)); + list = (new AspectList()).add(Aspect.BEAST, 2).add(Aspect.CLOTH, 2).add(Aspect.SLIME, 1); + list.add(LUST, 2); + ThaumcraftApi.registerObjectTag(Item.leash.itemID, -1, list); } Iterator mobCount = ThaumcraftApi.scanEntities.iterator(); @@ -264,6 +268,10 @@ public class DarkAspects { mobTag.aspects.add(PRIDE, 4); } + else if(mobTag.entityName.equals("witchery.demon")) + { + mobTag.aspects.add(NETHER, 8); + } } ThaumcraftApi.registerObjectTag(ForbiddenItems.deadlyShards.itemID, 0, (new AspectList()).add(NETHER, 1).add(WRATH, 2).add(Aspect.CRYSTAL, 1)); @@ -274,10 +282,13 @@ public class DarkAspects ThaumcraftApi.registerObjectTag(ForbiddenItems.deadlyShards.itemID, 4, (new AspectList()).add(NETHER, 1).add(LUST, 2).add(Aspect.CRYSTAL, 1)); else ThaumcraftApi.registerObjectTag(ForbiddenItems.deadlyShards.itemID, 4, (new AspectList()).add(Aspect.VOID, 1)); + ThaumcraftApi.registerObjectTag(ForbiddenItems.gluttonyShard.itemID, -1, (new AspectList()).add(NETHER, 1).add(GLUTTONY, 2).add(Aspect.CRYSTAL, 1)); ThaumcraftApi.registerObjectTag(ForbiddenItems.deadlyShards.itemID, 5, (new AspectList()).add(NETHER, 1).add(SLOTH, 2).add(Aspect.CRYSTAL, 1)); ThaumcraftApi.registerObjectTag(ForbiddenItems.deadlyShards.itemID, 6, (new AspectList()).add(NETHER, 1).add(Aspect.GREED, 2).add(Aspect.CRYSTAL, 1)); ThaumcraftApi.registerObjectTag(ForbiddenItems.resource.itemID, 0, (new AspectList()).add(Aspect.CRYSTAL, 1)); ThaumcraftApi.registerObjectTag(ForbiddenItems.resource.itemID, 1, (new AspectList()).add(Aspect.DARKNESS, 1)); ThaumcraftApi.registerObjectTag(ForbiddenBlocks.blackFlower.blockID, -1, (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.LIFE, 1).add(Aspect.SENSES, 1).add(Aspect.DARKNESS, 1)); + if(!Config.noLust) + ThaumcraftApi.registerObjectTag(ForbiddenItems.ridingCrop.itemID, -1, (new AspectList()).add(Aspect.TREE, 2).add(Aspect.CLOTH, 2).add(Aspect.BEAST, 1).add(LUST, 1).add(Aspect.WEAPON, 1)); } } \ No newline at end of file diff --git a/src/com/spiteful/forbidden/ForbiddenRecipes.java b/src/com/spiteful/forbidden/ForbiddenRecipes.java index 8ff2d7c..6abfed2 100644 --- a/src/com/spiteful/forbidden/ForbiddenRecipes.java +++ b/src/com/spiteful/forbidden/ForbiddenRecipes.java @@ -58,7 +58,7 @@ public class ForbiddenRecipes ForbiddenResearch.recipes.put("BlackFlower", ThaumcraftApi.addCrucibleRecipe("BLACKFLOWER", new ItemStack(ForbiddenBlocks.blackFlower, 1, 0), new ItemStack(Block.plantRed), (new AspectList()).merge(Aspect.DARKNESS, 5).merge(Aspect.LIFE, 5))); ForbiddenResearch.recipes.put("BlackInk", CraftingManager.getInstance().addRecipe(new ItemStack(ForbiddenItems.resource, 2, 1), new Object[]{"#", Character.valueOf('#'), new ItemStack(ForbiddenBlocks.blackFlower, 1, 0)})); - ForbiddenResearch.recipes.put("Crystalwell", ThaumcraftApi.addShapelessArcaneCraftingRecipe("CRYSTALWELL", new ItemStack(ForbiddenItems.crystalwell, 1, 0), (new AspectList()).add(Aspect.EARTH, 5).add(Aspect.FIRE, 5).add(Aspect.AIR, 5).add(Aspect.WATER, 5).add(Aspect.ORDER, 5).add(Aspect.ENTROPY, 5), new Object[]{ItemApi.getItem("itemInkwell", 100), "dyeBlack", ItemApi.getBlock("blockCrystal", 6)})); + ForbiddenResearch.recipes.put("Crystalwell", ThaumcraftApi.addShapelessArcaneCraftingRecipe("CRYSTALWELL", new ItemStack(ForbiddenItems.crystalwell, 1, 0), (new AspectList()).add(Aspect.EARTH, 2).add(Aspect.FIRE, 2).add(Aspect.AIR, 2).add(Aspect.WATER, 2).add(Aspect.ORDER, 2).add(Aspect.ENTROPY, 2), new Object[]{ItemApi.getItem("itemInkwell", 32767), "dyeBlack", ItemApi.getItem("itemShard", 32767), ItemApi.getItem("itemShard", 32767)})); ForbiddenResearch.recipes.put("Cluster", ThaumcraftApi.addInfusionEnchantmentRecipe("CLUSTER", DarkEnchantments.cluster, 3, (new AspectList()).add(Aspect.FIRE, 4).add(Aspect.METAL, 4).add(Aspect.GREED, 4), new ItemStack[]{ItemApi.getItem("itemPickElemental", 0), ItemApi.getItem("itemResource", 14)})); if(Config.greedyEnch) @@ -70,6 +70,7 @@ public class ForbiddenRecipes CraftingManager.getInstance().addRecipe(new ItemStack(Item.emerald, 1, 0), new Object[]{"###", "###", "###", Character.valueOf('#'), new ItemStack(ForbiddenItems.resource, 1, 0)}); CraftingManager.getInstance().addRecipe(new ItemStack(ForbiddenItems.resource, 9, 0), new Object[]{"#", Character.valueOf('#'), new ItemStack(Item.emerald, 1, 0)}); + ForbiddenResearch.recipes.put("RidingCrop", CraftingManager.getInstance().addRecipe(new ItemStack(ForbiddenItems.ridingCrop, 1, 0), new Object[]{"X", "#", "#", Character.valueOf('#'), Item.stick, Character.valueOf('X'), Item.leather})); ThaumcraftApi.addSmeltingBonus(new ItemStack(Item.emerald), new ItemStack(ForbiddenItems.resource, 0, 0)); Iterator i$ = WandCap.caps.keySet().iterator(); diff --git a/src/com/spiteful/forbidden/ForbiddenResearch.java b/src/com/spiteful/forbidden/ForbiddenResearch.java index e93bc14..0463b85 100644 --- a/src/com/spiteful/forbidden/ForbiddenResearch.java +++ b/src/com/spiteful/forbidden/ForbiddenResearch.java @@ -67,6 +67,8 @@ 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("SKULLAXE", "FORBIDDEN", (new AspectList()).add(Aspect.WEAPON, 3).add(DarkAspects.WRATH, 4).add(DarkAspects.NETHER, 1), -8, 1, 4, new ItemStack(ForbiddenItems.skullAxe))).setPages(new ResearchPage[] {new ResearchPage("forbidden.research_page.SKULLAXE.1"), new ResearchPage((InfusionRecipe)recipes.get("SkullAxe"))}).setParents(new String[] {"THAUMIUM", "INFAUXSION"}).setConcealed().registerResearchItem(); (new DarkResearchItem("ARCANECAKE", "FORBIDDEN", (new AspectList()).add(DarkAspects.GLUTTONY, 4).add(Aspect.HUNGER, 3).add(Aspect.CRAFT, 2), -8, 2, 3, new ItemStack(ForbiddenItems.arcaneCakeItem))).setPages(new ResearchPage[] {new ResearchPage("forbidden.research_page.ARCANECAKE.1"), new ResearchPage((InfusionRecipe)recipes.get("ArcaneCake"))}).setParents(new String[] {"INFAUXSION"}).setAspectTriggers(new Aspect[]{DarkAspects.GLUTTONY}).registerResearchItem(); (new DarkResearchItem("MORPHTOOLS", "FORBIDDEN", (new AspectList()).add(Aspect.TOOL, 2).add(DarkAspects.ENVY, 3).add(Aspect.EXCHANGE, 2), -5, 5, 5, new ItemStack(ForbiddenItems.morphPickaxe))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.MORPHTOOLS.1"), new ResearchPage((InfusionRecipe)recipes.get("MorphPick")), new ResearchPage((InfusionRecipe)recipes.get("MorphSword")), new ResearchPage((InfusionRecipe)recipes.get("MorphShovel")), new ResearchPage((InfusionRecipe)recipes.get("MorphAxe"))}).setParentsHidden(new String[]{"THAUMIUM", "INFUSIONENCHANTMENT"}).setParents(new String[]{"INFAUXSIONENCHANTMENT"}).setConcealed().registerResearchItem(); @@ -78,9 +80,9 @@ public class ForbiddenResearch if(Config.wrathCage){ if(Config.wrathCost > 0) - (new DarkResearchItem("WRATHCAGE", "FORBIDDEN", (new AspectList()).add(DarkAspects.WRATH, 5).add(Aspect.MECHANISM, 3).add(Aspect.BEAST, 2), -2, 0, 6, new ItemStack(ForbiddenBlocks.wrathCage))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.WRATHCAGE.1"), new ResearchPage((InfusionRecipe)recipes.get("WrathCage")), new ResearchPage("forbidden.research_page.WRATHCAGE.2"), new ResearchPage("forbidden.research_page.WRATHCAGE.3"), new ResearchPage((CrucibleRecipe)recipes.get("MobCrystal"))}).setParents(new String[]{"INFAUXSION"}).setParentsHidden(new String[]{"THAUMIUM", "DISTILESSENTIA"}).setSiblings(new String[]{"FORK"}).registerResearchItem(); + (new DarkResearchItem("WRATHCAGE", "FORBIDDEN", (new AspectList()).add(DarkAspects.WRATH, 5).add(Aspect.MECHANISM, 3).add(Aspect.BEAST, 2), -2, 0, 6, new ItemStack(ForbiddenBlocks.wrathCage))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.WRATHCAGE.1"), new ResearchPage((InfusionRecipe)recipes.get("WrathCage")), new ResearchPage("forbidden.research_page.WRATHCAGE.2"), new ResearchPage("forbidden.research_page.WRATHCAGE.3"), new ResearchPage((CrucibleRecipe)recipes.get("MobCrystal"))}).setParents(new String[]{"INFAUXSION"}).setParentsHidden(new String[]{"THAUMIUM", "DISTILESSENTIA"}).setConcealed().setSiblings(new String[]{"FORK"}).registerResearchItem(); else - (new DarkResearchItem("WRATHCAGE", "FORBIDDEN", (new AspectList()).add(DarkAspects.WRATH, 5).add(Aspect.MECHANISM, 3).add(Aspect.BEAST, 2), -2, 0, 6, new ItemStack(ForbiddenBlocks.wrathCage))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.WRATHCAGE.1"), new ResearchPage((InfusionRecipe)recipes.get("WrathCage")), new ResearchPage("forbidden.research_page.WRATHCAGE.3"), new ResearchPage((CrucibleRecipe)recipes.get("MobCrystal"))}).setParents(new String[]{"INFAUXSION"}).setParentsHidden(new String[]{"THAUMIUM", "DISTILESSENTIA"}).setSiblings(new String[]{"FORK"}).registerResearchItem(); + (new DarkResearchItem("WRATHCAGE", "FORBIDDEN", (new AspectList()).add(DarkAspects.WRATH, 5).add(Aspect.MECHANISM, 3).add(Aspect.BEAST, 2), -2, 0, 6, new ItemStack(ForbiddenBlocks.wrathCage))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.WRATHCAGE.1"), new ResearchPage((InfusionRecipe)recipes.get("WrathCage")), new ResearchPage("forbidden.research_page.WRATHCAGE.3"), new ResearchPage((CrucibleRecipe)recipes.get("MobCrystal"))}).setParents(new String[]{"INFAUXSION"}).setParentsHidden(new String[]{"THAUMIUM", "DISTILESSENTIA"}).setConcealed().setSiblings(new String[]{"FORK"}).registerResearchItem(); } diff --git a/src/com/spiteful/forbidden/items/ForbiddenItems.java b/src/com/spiteful/forbidden/items/ForbiddenItems.java index ef8d0d6..6c471e5 100644 --- a/src/com/spiteful/forbidden/items/ForbiddenItems.java +++ b/src/com/spiteful/forbidden/items/ForbiddenItems.java @@ -5,6 +5,7 @@ import com.spiteful.forbidden.*; import cpw.mods.fml.common.registry.GameRegistry; import java.util.Arrays; import net.minecraft.block.Block; +import net.minecraft.item.EnumToolMaterial; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; @@ -34,6 +35,7 @@ public class ForbiddenItems public static Item morphAxe; public static Item bloodwell; public static Item crystalwell; + public static Item ridingCrop; public static WandRod WAND_ROD_TAINTED; public static WandRod WAND_ROD_INFERNAL; @@ -135,5 +137,8 @@ public class ForbiddenItems crystalwell = new ItemCrystalwell(Config.crystalwellID).setUnlocalizedName("Crystalwell"); GameRegistry.registerItem(crystalwell, "Crystalwell"); + ridingCrop = new ItemRidingCrop(Config.ridingCropID, EnumToolMaterial.WOOD).setUnlocalizedName("RidingCrop"); + GameRegistry.registerItem(ridingCrop, "RidingCrop"); + } } \ No newline at end of file diff --git a/src/com/spiteful/forbidden/items/ItemRidingCrop.java b/src/com/spiteful/forbidden/items/ItemRidingCrop.java new file mode 100644 index 0000000..fcc5905 --- /dev/null +++ b/src/com/spiteful/forbidden/items/ItemRidingCrop.java @@ -0,0 +1,142 @@ +package com.spiteful.forbidden.items; + +import com.spiteful.forbidden.Forbidden; +import com.spiteful.forbidden.Config; + +import com.google.common.collect.Multimap; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.ai.attributes.AttributeModifier; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.passive.EntityHorse; +import net.minecraft.entity.passive.EntityPig; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumAction; +import net.minecraft.item.EnumToolMaterial; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemSword; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.Icon; +import net.minecraft.util.DamageSource; +import net.minecraft.world.World; +import thaumcraft.api.IRepairable; + +public class ItemRidingCrop extends ItemSword { + + public Icon icon; + + public ItemRidingCrop(int id, EnumToolMaterial mat){ + super(id, mat); + this.setCreativeTab(Forbidden.tab); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IconRegister ir) + { + this.icon = ir.registerIcon("forbidden:crop"); + } + + /** + * Current implementations of this method in child classes do not use the entry argument beside ev. They just raise + * the damage on the stack. + */ + public boolean hitEntity(ItemStack stack, EntityLivingBase victim, EntityLivingBase player) + { + stack.damageItem(1, player); + if(victim instanceof EntityHorse || victim instanceof EntityPig) + victim.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 175, 5)); + else if(victim instanceof EntityPlayer) + { + victim.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 75, 1)); + victim.addPotionEffect(new PotionEffect(Potion.digSpeed.id, 75, 1)); + } + if(!player.worldObj.isRemote && !Config.noLust && !Config.noHell && player.worldObj.provider.dimensionId == -1 && player.worldObj.rand.nextInt(30) == 1) + { + EntityItem ent = victim.entityDropItem(new ItemStack(ForbiddenItems.deadlyShards, 1, 4), 1.0F); + ent.motionY += player.worldObj.rand.nextFloat() * 0.05F; + ent.motionX += (player.worldObj.rand.nextFloat() - player.worldObj.rand.nextFloat()) * 0.1F; + ent.motionZ += (player.worldObj.rand.nextFloat() - player.worldObj.rand.nextFloat()) * 0.1F; + } + return true; + } + + @Override + @SideOnly(Side.CLIENT) + public Icon getIconFromDamage(int par1) + { + return this.icon; + } + + @Override + /** + * Returns the strength of the stack against a given block. 1.0F base, (Quality+1)*2 if correct blocktype, 1.5F if + * sword + */ + public float getStrVsBlock(ItemStack par1ItemStack, Block par2Block) + { + return 1.0F; + } + + @Override + /** + * returns the action that specifies what animation to play when the items is being used + */ + public EnumAction getItemUseAction(ItemStack par1ItemStack) + { + return EnumAction.none; + } + + @Override + /** + * How long it takes to use or consume an item + */ + public int getMaxItemUseDuration(ItemStack par1ItemStack) + { + return 0; + } + + @Override + /** + * Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer + */ + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) + { + if(player.ridingEntity != null && player.ridingEntity instanceof EntityLivingBase) + { + EntityLivingBase mount = (EntityLivingBase)player.ridingEntity; + stack.damageItem(1, player); + player.swingItem(); + //mount.attackEntityFrom(DamageSource.causePlayerDamage(player), 4.0F); + mount.attackEntityFrom(DamageSource.generic, 1.0F); + mount.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 175, 5)); + } + return stack; + } + + @Override + /** + * Return whether this item is repairable in an anvil. + */ + public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) + { + return par2ItemStack.itemID == Item.leather.itemID ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); + } + + @Override + /** + * Returns if the item (tool) can harvest results from the block type. + */ + public boolean canHarvestBlock(Block par1Block) + { + return false; + } +} \ No newline at end of file