diff --git a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java index 4183e16f0..295d2ff30 100644 --- a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -87,6 +87,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.manasteelLegs); addItem(ModItems.manasteelBoots); addItem(ModItems.terraSword); + addItem(ModItems.terraPick); addItem(ModItems.terrasteelHelm); addItem(ModItems.terrasteelChest); addItem(ModItems.terrasteelLegs); diff --git a/MODSRC/vazkii/botania/common/item/ModItems.java b/MODSRC/vazkii/botania/common/item/ModItems.java index 84a8eae4b..59c1c5765 100644 --- a/MODSRC/vazkii/botania/common/item/ModItems.java +++ b/MODSRC/vazkii/botania/common/item/ModItems.java @@ -41,6 +41,7 @@ import vazkii.botania.common.item.equipment.tool.ItemManasteelPick; import vazkii.botania.common.item.equipment.tool.ItemManasteelShears; import vazkii.botania.common.item.equipment.tool.ItemManasteelShovel; import vazkii.botania.common.item.equipment.tool.ItemManasteelSword; +import vazkii.botania.common.item.equipment.tool.ItemTerraPick; import vazkii.botania.common.item.equipment.tool.ItemTerraSword; import vazkii.botania.common.lib.LibOreDict; @@ -92,6 +93,7 @@ public final class ModItems { public static Item magnetRing; public static Item waterRing; public static Item miningRing; + public static Item terraPick; public static void init() { lexicon = new ItemLexicon(); @@ -140,6 +142,7 @@ public final class ModItems { magnetRing = new ItemMagnetRing(); waterRing = new ItemWaterRing(); miningRing = new ItemMiningRing(); + terraPick = new ItemTerraPick(); OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); for(int i = 0; i < 16; i++) { diff --git a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelPick.java b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelPick.java index db1c67c52..f831b23ec 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelPick.java +++ b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelPick.java @@ -33,9 +33,13 @@ public class ItemManasteelPick extends ItemPickaxe { private static final int MANA_PER_DAMAGE = 60; public ItemManasteelPick() { - super(BotaniaAPI.manasteelToolMaterial); + this(BotaniaAPI.manasteelToolMaterial, LibItemNames.MANASTEEL_PICK); + } + + public ItemManasteelPick(ToolMaterial mat, String name) { + super(mat); setCreativeTab(BotaniaCreativeTab.INSTANCE); - setUnlocalizedName(LibItemNames.MANASTEEL_PICK); + setUnlocalizedName(name); } @Override diff --git a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemTerraPick.java b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemTerraPick.java new file mode 100644 index 000000000..da12f41ee --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemTerraPick.java @@ -0,0 +1,49 @@ +/** + * 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 a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [May 20, 2014, 10:56:14 PM (GMT)] + */ +package vazkii.botania.common.item.equipment.tool; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.common.lib.LibItemNames; + +public class ItemTerraPick extends ItemManasteelPick { + + IIcon iconTool, iconOverlay; + + public ItemTerraPick() { + super(BotaniaAPI.terrasteelToolMaterial, LibItemNames.TERRA_PICK); + } + + @Override + public void registerIcons(IIconRegister par1IconRegister) { + iconTool = IconHelper.forItem(par1IconRegister, this, 0); + iconOverlay = IconHelper.forItem(par1IconRegister, this, 1); + } + + @Override + public boolean requiresMultipleRenderPasses() { + return true; + } + + @Override + public IIcon getIcon(ItemStack stack, int pass) { + return pass == 2 && isEnabled(stack) ? iconOverlay : iconTool; + } + + boolean isEnabled(ItemStack stack) { + return false; // TODO + } + +} diff --git a/MODSRC/vazkii/botania/common/lib/LibItemNames.java b/MODSRC/vazkii/botania/common/lib/LibItemNames.java index bc90960e1..205943aa1 100644 --- a/MODSRC/vazkii/botania/common/lib/LibItemNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibItemNames.java @@ -60,6 +60,7 @@ public final class LibItemNames { public static final String MAGNET_RING = "magnetRing"; public static final String WATER_RING = "waterRing"; public static final String MINING_RING = "miningRing"; + public static final String TERRA_PICK = "terraPick"; public static final String[] LENS_NAMES = new String[] { "lensNormal", diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index f82fba255..910c2be9f 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -326,6 +326,7 @@ item.botania:redstoneRoot.name=Redstone Root item.botania:magnetRing.name=Ring of Magnetization item.botania:waterRing.name=Ring of Chordata item.botania:miningRing.name=Ring of the Mantle +item.botania:terraPick.name=Terra Breaker # GUI TEXT botania.gui.lexicon.header=Lexica Botania Index - Pick which category you would like to study: diff --git a/resources/assets/botania/textures/items/terraPick0.png b/resources/assets/botania/textures/items/terraPick0.png new file mode 100644 index 000000000..61b1547ac Binary files /dev/null and b/resources/assets/botania/textures/items/terraPick0.png differ diff --git a/resources/assets/botania/textures/items/terraPick1.png b/resources/assets/botania/textures/items/terraPick1.png new file mode 100644 index 000000000..d126753f9 Binary files /dev/null and b/resources/assets/botania/textures/items/terraPick1.png differ