diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index d821db8b7..56ff52907 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -153,6 +153,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.elementiumAxe); addItem(ModItems.elementiumShears); addItem(ModItems.elementiumSword); + addItem(ModItems.crystalBow); addItem(ModItems.elementiumHelm); if(Botania.thaumcraftLoaded) addItem(ModItems.elementiumHelmRevealing); diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 63ed678d4..1f0b3884d 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -56,6 +56,7 @@ import vazkii.botania.common.item.equipment.tool.ItemEnderDagger; import vazkii.botania.common.item.equipment.tool.ItemGlassPick; import vazkii.botania.common.item.equipment.tool.ItemTerraPick; import vazkii.botania.common.item.equipment.tool.ItemTerraSword; +import vazkii.botania.common.item.equipment.tool.bow.ItemCrystalBow; import vazkii.botania.common.item.equipment.tool.bow.ItemLivingwoodBow; import vazkii.botania.common.item.equipment.tool.elementium.ItemElementiumAxe; import vazkii.botania.common.item.equipment.tool.elementium.ItemElementiumPick; @@ -204,7 +205,8 @@ public final class ModItems { public static Item ancientWill; public static Item corporeaSpark; public static Item livingwoodBow; - + public static Item crystalBow; + public static void init() { lexicon = new ItemLexicon(); petal = new ItemPetal(); @@ -315,6 +317,7 @@ public final class ModItems { ancientWill = new ItemAncientWill(); corporeaSpark = new ItemCorporeaSpark(); livingwoodBow = new ItemLivingwoodBow(); + crystalBow = new ItemCrystalBow(); OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); for(int i = 0; i < 16; i++) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemCrystalBow.java b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemCrystalBow.java new file mode 100644 index 000000000..cf1bad8e4 --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemCrystalBow.java @@ -0,0 +1,26 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Feb 21, 2015, 6:33:40 PM (GMT)] + */ +package vazkii.botania.common.item.equipment.tool.bow; + +import vazkii.botania.common.lib.LibItemNames; + +public class ItemCrystalBow extends ItemLivingwoodBow { + + public ItemCrystalBow() { + super(LibItemNames.CRYSTAL_BOW); + } + + @Override + boolean postsEvent() { + return false; + } + +} diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java index 08581bd6b..183e2ad90 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java @@ -131,11 +131,6 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { pullIcons[i] = IconHelper.forItem(par1IconRegister, this, i + 1); } - @Override - public IIcon getIcon(ItemStack stack, int pass) { - return getIconIndex(stack); - } - @Override public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5) { if(!world.isRemote && player instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (EntityPlayer) player, MANA_PER_DAMAGE * 2, true)) diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index 45fbb4c2b..ec2cc68cd 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -122,6 +122,7 @@ public final class LibItemNames { public static final String ANCIENT_WILL = "ancientWill"; public static final String CORPOREA_SPARK = "corporeaSpark"; public static final String LIVINGWOOD_BOW = "livingwoodBow"; + public static final String CRYSTAL_BOW = "crystalBow"; public static final String[] LENS_NAMES = new String[] { "lensNormal", diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index cc00e88f6..01e2a4f0e 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1031,6 +1031,7 @@ item.botania:corporeaSpark0.name=Corporea Spark item.botania:corporeaSpark1.name=Master Corporea Spark item.botania:enderAirBottle.name=Ender Air Botte item.botania:livingwoodBow.name=Livingwood Bow +item.botania:crystalBow.name=Crystal Bow # BREW NAMES botania.brew.fallback=Fallback