diff --git a/MODSRC/vazkii/botania/api/BotaniaAPI.java b/MODSRC/vazkii/botania/api/BotaniaAPI.java index 5c3965e9f..4b45b7441 100644 --- a/MODSRC/vazkii/botania/api/BotaniaAPI.java +++ b/MODSRC/vazkii/botania/api/BotaniaAPI.java @@ -66,6 +66,9 @@ public final class BotaniaAPI { public static ArmorMaterial manasteelArmorMaterial = EnumHelper.addArmorMaterial("MANASTEEL", 16, new int[] { 2, 6, 5, 2 }, 18); public static ToolMaterial manasteelToolMaterial = EnumHelper.addToolMaterial("MANASTEEL", 3, 300, 6.2F, 2F, 20); + public static ArmorMaterial elementiumArmorMaterial = EnumHelper.addArmorMaterial("B_ELEMENTIUM", 18, new int[] { 2, 6, 5, 2 }, 18); + public static ToolMaterial elementiumToolMaterial = EnumHelper.addToolMaterial("B_ELEMENTIUM", 3, 720, 6.2F, 2F, 20); + public static ArmorMaterial terrasteelArmorMaterial = EnumHelper.addArmorMaterial("TERRASTEEL", 34, new int[] {3, 8, 6, 3}, 26); public static ToolMaterial terrasteelToolMaterial = EnumHelper.addToolMaterial("TERRASTEEL", 3, 2300, 9F, 3F, 26); diff --git a/MODSRC/vazkii/botania/client/lib/LibResources.java b/MODSRC/vazkii/botania/client/lib/LibResources.java index 93e857cdc..02d7c1725 100644 --- a/MODSRC/vazkii/botania/client/lib/LibResources.java +++ b/MODSRC/vazkii/botania/client/lib/LibResources.java @@ -66,7 +66,9 @@ public final class LibResources { public static final String MODEL_MANASTEEL_1 = PREFIX_MODEL + "manasteel1.png"; public static final String MODEL_TERRASTEEL_0 = PREFIX_MODEL + "terrasteel0.png"; public static final String MODEL_TERRASTEEL_1 = PREFIX_MODEL + "terrasteel1.png"; - + public static final String MODEL_ELEMENTIUM_0 = PREFIX_MODEL + "elementium0.png"; + public static final String MODEL_ELEMENTIUM_1 = PREFIX_MODEL + "elementium1.png"; + public static final String MODEL_CAPE = "/assets/botania/textures/model/cape.png"; public static final String MISC_PARTICLES = PREFIX_MISC + "particles.png"; diff --git a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java index e411d8732..8b067bc1a 100644 --- a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -132,7 +132,16 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.terrasteelChest); addItem(ModItems.terrasteelLegs); addItem(ModItems.terrasteelBoots); - + addItem(ModItems.elementiumPick); + addItem(ModItems.elementiumShovel); + addItem(ModItems.elementiumAxe); + addItem(ModItems.elementiumShears); + addItem(ModItems.elementiumSword); + addItem(ModItems.elementiumHelm); + addItem(ModItems.elementiumChest); + addItem(ModItems.elementiumLegs); + addItem(ModItems.elementiumBoots); + addItem(ModItems.tinyPlanet); addBlock(ModBlocks.tinyPlanet); addItem(ModItems.manaRing); diff --git a/MODSRC/vazkii/botania/common/item/ModItems.java b/MODSRC/vazkii/botania/common/item/ModItems.java index d93d711d9..457966ea4 100644 --- a/MODSRC/vazkii/botania/common/item/ModItems.java +++ b/MODSRC/vazkii/botania/common/item/ModItems.java @@ -11,18 +11,21 @@ */ package vazkii.botania.common.item; -import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import vazkii.botania.common.item.equipment.armor.ItemManasteelBoots; -import vazkii.botania.common.item.equipment.armor.ItemManasteelChest; -import vazkii.botania.common.item.equipment.armor.ItemManasteelHelm; -import vazkii.botania.common.item.equipment.armor.ItemManasteelLegs; -import vazkii.botania.common.item.equipment.armor.ItemTerrasteelBoots; -import vazkii.botania.common.item.equipment.armor.ItemTerrasteelChest; -import vazkii.botania.common.item.equipment.armor.ItemTerrasteelHelm; -import vazkii.botania.common.item.equipment.armor.ItemTerrasteelLegs; +import vazkii.botania.common.item.equipment.armor.elementium.ItemElementiumBoots; +import vazkii.botania.common.item.equipment.armor.elementium.ItemElementiumChest; +import vazkii.botania.common.item.equipment.armor.elementium.ItemElementiumHelm; +import vazkii.botania.common.item.equipment.armor.elementium.ItemElementiumLegs; +import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelBoots; +import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelChest; +import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelHelm; +import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelLegs; +import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelBoots; +import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelChest; +import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelHelm; +import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelLegs; import vazkii.botania.common.item.equipment.bauble.ItemAuraRing; import vazkii.botania.common.item.equipment.bauble.ItemDivaCharm; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; @@ -38,6 +41,11 @@ import vazkii.botania.common.item.equipment.bauble.ItemMiningRing; import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet; import vazkii.botania.common.item.equipment.bauble.ItemTravelBelt; import vazkii.botania.common.item.equipment.bauble.ItemWaterRing; +import vazkii.botania.common.item.equipment.tool.ItemElementiumAxe; +import vazkii.botania.common.item.equipment.tool.ItemElementiumPick; +import vazkii.botania.common.item.equipment.tool.ItemElementiumShears; +import vazkii.botania.common.item.equipment.tool.ItemElementiumShovel; +import vazkii.botania.common.item.equipment.tool.ItemElementiumSword; import vazkii.botania.common.item.equipment.tool.ItemEnderDagger; import vazkii.botania.common.item.equipment.tool.ItemManasteelAxe; import vazkii.botania.common.item.equipment.tool.ItemManasteelPick; @@ -102,6 +110,15 @@ public final class ModItems { public static Item enderDagger; public static Item quartz; public static Item waterRod; + public static Item elementiumHelm; + public static Item elementiumChest; + public static Item elementiumLegs; + public static Item elementiumBoots; + public static Item elementiumPick; + public static Item elementiumShovel; + public static Item elementiumAxe; + public static Item elementiumSword; + public static Item elementiumShears; public static void init() { lexicon = new ItemLexicon(); @@ -156,6 +173,15 @@ public final class ModItems { enderDagger = new ItemEnderDagger(); quartz = new ItemQuartz(); waterRod = new ItemWaterRod(); + elementiumHelm = new ItemElementiumHelm(); + elementiumChest = new ItemElementiumChest(); + elementiumLegs = new ItemElementiumLegs(); + elementiumBoots = new ItemElementiumBoots(); + elementiumPick = new ItemElementiumPick(); + elementiumShovel = new ItemElementiumShovel(); + elementiumAxe = new ItemElementiumAxe(); + elementiumSword = new ItemElementiumSword(); + elementiumShears = new ItemElementiumShears(); OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); for(int i = 0; i < 16; i++) { diff --git a/MODSRC/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java b/MODSRC/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java new file mode 100644 index 000000000..52823f720 --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java @@ -0,0 +1,26 @@ +package vazkii.botania.common.item.equipment.armor.elementium; + +import net.minecraft.entity.Entity; +import net.minecraft.item.ItemStack; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor; + +public class ItemElementiumArmor extends ItemManasteelArmor { + + public ItemElementiumArmor(int type, String name) { + super(type, name, BotaniaAPI.elementiumArmorMaterial); + } + + @Override + public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { + return slot == 2 ? LibResources.MODEL_ELEMENTIUM_1 : LibResources.MODEL_ELEMENTIUM_0; + } + + @Override + public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { + return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 7 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); + } + +} diff --git a/MODSRC/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumBoots.java b/MODSRC/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumBoots.java new file mode 100644 index 000000000..94d676ac3 --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumBoots.java @@ -0,0 +1,11 @@ +package vazkii.botania.common.item.equipment.armor.elementium; + +import vazkii.botania.common.lib.LibItemNames; + +public class ItemElementiumBoots extends ItemElementiumArmor { + + public ItemElementiumBoots() { + super(3, LibItemNames.ELEMENTIUM_BOOTS); + } + +} diff --git a/MODSRC/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumChest.java b/MODSRC/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumChest.java new file mode 100644 index 000000000..d213e4cfc --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumChest.java @@ -0,0 +1,11 @@ +package vazkii.botania.common.item.equipment.armor.elementium; + +import vazkii.botania.common.lib.LibItemNames; + +public class ItemElementiumChest extends ItemElementiumArmor { + + public ItemElementiumChest() { + super(1, LibItemNames.ELEMENTIUM_CHEST); + } + +} diff --git a/MODSRC/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumHelm.java b/MODSRC/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumHelm.java new file mode 100644 index 000000000..5c11e2390 --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumHelm.java @@ -0,0 +1,11 @@ +package vazkii.botania.common.item.equipment.armor.elementium; + +import vazkii.botania.common.lib.LibItemNames; + +public class ItemElementiumHelm extends ItemElementiumArmor { + + public ItemElementiumHelm() { + super(0, LibItemNames.ELEMENTIUM_HELM); + } + +} diff --git a/MODSRC/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumLegs.java b/MODSRC/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumLegs.java new file mode 100644 index 000000000..767587e20 --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumLegs.java @@ -0,0 +1,11 @@ +package vazkii.botania.common.item.equipment.armor.elementium; + +import vazkii.botania.common.lib.LibItemNames; + +public class ItemElementiumLegs extends ItemElementiumArmor { + + public ItemElementiumLegs() { + super(2, LibItemNames.ELEMENTIUM_LEGS); + } + +} diff --git a/MODSRC/vazkii/botania/common/item/equipment/armor/ItemManasteelArmor.java b/MODSRC/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java similarity index 98% rename from MODSRC/vazkii/botania/common/item/equipment/armor/ItemManasteelArmor.java rename to MODSRC/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index fe0143be5..75d78f600 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/armor/ItemManasteelArmor.java +++ b/MODSRC/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -9,7 +9,7 @@ * * File Created @ [Apr 13, 2014, 6:38:21 PM (GMT)] */ -package vazkii.botania.common.item.equipment.armor; +package vazkii.botania.common.item.equipment.armor.manasteel; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; diff --git a/MODSRC/vazkii/botania/common/item/equipment/armor/ItemManasteelBoots.java b/MODSRC/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelBoots.java similarity index 90% rename from MODSRC/vazkii/botania/common/item/equipment/armor/ItemManasteelBoots.java rename to MODSRC/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelBoots.java index da9a6a8dc..9aab6197d 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/armor/ItemManasteelBoots.java +++ b/MODSRC/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelBoots.java @@ -9,7 +9,7 @@ * * File Created @ [Apr 13, 2014, 10:24:08 PM (GMT)] */ -package vazkii.botania.common.item.equipment.armor; +package vazkii.botania.common.item.equipment.armor.manasteel; import vazkii.botania.common.lib.LibItemNames; diff --git a/MODSRC/vazkii/botania/common/item/equipment/armor/ItemManasteelChest.java b/MODSRC/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelChest.java similarity index 90% rename from MODSRC/vazkii/botania/common/item/equipment/armor/ItemManasteelChest.java rename to MODSRC/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelChest.java index 286813c22..625a7f92e 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/armor/ItemManasteelChest.java +++ b/MODSRC/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelChest.java @@ -9,7 +9,7 @@ * * File Created @ [Apr 13, 2014, 10:22:57 PM (GMT)] */ -package vazkii.botania.common.item.equipment.armor; +package vazkii.botania.common.item.equipment.armor.manasteel; import vazkii.botania.common.lib.LibItemNames; diff --git a/MODSRC/vazkii/botania/common/item/equipment/armor/ItemManasteelHelm.java b/MODSRC/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelHelm.java similarity index 90% rename from MODSRC/vazkii/botania/common/item/equipment/armor/ItemManasteelHelm.java rename to MODSRC/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelHelm.java index 33a95c840..6e89bc92b 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/armor/ItemManasteelHelm.java +++ b/MODSRC/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelHelm.java @@ -9,7 +9,7 @@ * * File Created @ [Apr 13, 2014, 10:22:24 PM (GMT)] */ -package vazkii.botania.common.item.equipment.armor; +package vazkii.botania.common.item.equipment.armor.manasteel; import vazkii.botania.common.lib.LibItemNames; diff --git a/MODSRC/vazkii/botania/common/item/equipment/armor/ItemManasteelLegs.java b/MODSRC/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelLegs.java similarity index 90% rename from MODSRC/vazkii/botania/common/item/equipment/armor/ItemManasteelLegs.java rename to MODSRC/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelLegs.java index 0987b9b35..edc0a66c6 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/armor/ItemManasteelLegs.java +++ b/MODSRC/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelLegs.java @@ -9,7 +9,7 @@ * * File Created @ [Apr 13, 2014, 10:23:28 PM (GMT)] */ -package vazkii.botania.common.item.equipment.armor; +package vazkii.botania.common.item.equipment.armor.manasteel; import vazkii.botania.common.lib.LibItemNames; diff --git a/MODSRC/vazkii/botania/common/item/equipment/armor/ItemTerrasteeelArmor.java b/MODSRC/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteeelArmor.java similarity index 92% rename from MODSRC/vazkii/botania/common/item/equipment/armor/ItemTerrasteeelArmor.java rename to MODSRC/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteeelArmor.java index 02a0eb4f2..46a09edd3 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/armor/ItemTerrasteeelArmor.java +++ b/MODSRC/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteeelArmor.java @@ -9,7 +9,7 @@ * * File Created @ [Apr 14, 2014, 2:58:13 PM (GMT)] */ -package vazkii.botania.common.item.equipment.armor; +package vazkii.botania.common.item.equipment.armor.terrasteel; import java.util.UUID; @@ -20,6 +20,7 @@ import net.minecraft.item.ItemStack; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; diff --git a/MODSRC/vazkii/botania/common/item/equipment/armor/ItemTerrasteelBoots.java b/MODSRC/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelBoots.java similarity index 91% rename from MODSRC/vazkii/botania/common/item/equipment/armor/ItemTerrasteelBoots.java rename to MODSRC/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelBoots.java index 4d7c7b9c2..33e66fa02 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/armor/ItemTerrasteelBoots.java +++ b/MODSRC/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelBoots.java @@ -9,7 +9,7 @@ * * File Created @ [Apr 14, 2014, 3:14:11 PM (GMT)] */ -package vazkii.botania.common.item.equipment.armor; +package vazkii.botania.common.item.equipment.armor.terrasteel; import vazkii.botania.common.lib.LibItemNames; diff --git a/MODSRC/vazkii/botania/common/item/equipment/armor/ItemTerrasteelChest.java b/MODSRC/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelChest.java similarity index 91% rename from MODSRC/vazkii/botania/common/item/equipment/armor/ItemTerrasteelChest.java rename to MODSRC/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelChest.java index d41da4ef9..bce77cb22 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/armor/ItemTerrasteelChest.java +++ b/MODSRC/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelChest.java @@ -9,7 +9,7 @@ * * File Created @ [Apr 14, 2014, 3:13:36 PM (GMT)] */ -package vazkii.botania.common.item.equipment.armor; +package vazkii.botania.common.item.equipment.armor.terrasteel; import vazkii.botania.common.lib.LibItemNames; diff --git a/MODSRC/vazkii/botania/common/item/equipment/armor/ItemTerrasteelHelm.java b/MODSRC/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java similarity index 91% rename from MODSRC/vazkii/botania/common/item/equipment/armor/ItemTerrasteelHelm.java rename to MODSRC/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java index 95618026f..d4d09d79c 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/armor/ItemTerrasteelHelm.java +++ b/MODSRC/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java @@ -9,7 +9,7 @@ * * File Created @ [Apr 14, 2014, 3:13:05 PM (GMT)] */ -package vazkii.botania.common.item.equipment.armor; +package vazkii.botania.common.item.equipment.armor.terrasteel; import vazkii.botania.common.lib.LibItemNames; diff --git a/MODSRC/vazkii/botania/common/item/equipment/armor/ItemTerrasteelLegs.java b/MODSRC/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelLegs.java similarity index 91% rename from MODSRC/vazkii/botania/common/item/equipment/armor/ItemTerrasteelLegs.java rename to MODSRC/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelLegs.java index 1c43bb536..b756b242f 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/armor/ItemTerrasteelLegs.java +++ b/MODSRC/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelLegs.java @@ -9,7 +9,7 @@ * * File Created @ [Apr 14, 2014, 3:13:49 PM (GMT)] */ -package vazkii.botania.common.item.equipment.armor; +package vazkii.botania.common.item.equipment.armor.terrasteel; import vazkii.botania.common.lib.LibItemNames; diff --git a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemElementiumAxe.java b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemElementiumAxe.java new file mode 100644 index 000000000..f5497862f --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemElementiumAxe.java @@ -0,0 +1,12 @@ +package vazkii.botania.common.item.equipment.tool; + +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.common.lib.LibItemNames; + +public class ItemElementiumAxe extends ItemManasteelAxe { + + public ItemElementiumAxe() { + super(BotaniaAPI.elementiumToolMaterial, LibItemNames.ELEMENTIUM_AXE); + } + +} diff --git a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemElementiumPick.java b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemElementiumPick.java new file mode 100644 index 000000000..8a7834e73 --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemElementiumPick.java @@ -0,0 +1,13 @@ +package vazkii.botania.common.item.equipment.tool; + +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.common.lib.LibItemNames; + +public class ItemElementiumPick extends ItemManasteelPick { + + public ItemElementiumPick() { + super(BotaniaAPI.elementiumToolMaterial, LibItemNames.ELEMENTIUM_PICK); + } + + +} diff --git a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemElementiumShears.java b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemElementiumShears.java new file mode 100644 index 000000000..190c0607c --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemElementiumShears.java @@ -0,0 +1,11 @@ +package vazkii.botania.common.item.equipment.tool; + +import vazkii.botania.common.lib.LibItemNames; + +public class ItemElementiumShears extends ItemManasteelShears { + + public ItemElementiumShears() { + super(LibItemNames.ELEMENTIUM_SHEARS); + } + +} diff --git a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemElementiumShovel.java b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemElementiumShovel.java new file mode 100644 index 000000000..b90de567a --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemElementiumShovel.java @@ -0,0 +1,12 @@ +package vazkii.botania.common.item.equipment.tool; + +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.common.lib.LibItemNames; + +public class ItemElementiumShovel extends ItemManasteelShovel { + + public ItemElementiumShovel() { + super(BotaniaAPI.elementiumToolMaterial, LibItemNames.ELEMENTIUM_SHOVEL); + } + +} diff --git a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemElementiumSword.java b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemElementiumSword.java new file mode 100644 index 000000000..e8772dc6a --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemElementiumSword.java @@ -0,0 +1,12 @@ +package vazkii.botania.common.item.equipment.tool; + +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.common.lib.LibItemNames; + +public class ItemElementiumSword extends ItemManasteelSword { + + public ItemElementiumSword() { + super(BotaniaAPI.elementiumToolMaterial, LibItemNames.ELEMENTIUM_SWORD); + } + +} diff --git a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelAxe.java b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelAxe.java index 3b9cfded2..b8f6b2f0c 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelAxe.java +++ b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelAxe.java @@ -17,6 +17,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.Item; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; +import net.minecraft.item.Item.ToolMaterial; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.mana.IManaUsingItem; @@ -34,9 +35,13 @@ public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem { private static final int MANA_PER_DAMAGE = 60; public ItemManasteelAxe() { - super(BotaniaAPI.manasteelToolMaterial); + this(BotaniaAPI.manasteelToolMaterial, LibItemNames.MANASTEEL_AXE); + } + + public ItemManasteelAxe(ToolMaterial mat, String name) { + super(mat); setCreativeTab(BotaniaCreativeTab.INSTANCE); - setUnlocalizedName(LibItemNames.MANASTEEL_AXE); + setUnlocalizedName(name); } @Override diff --git a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelShears.java b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelShears.java index 05b8af025..528545c53 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelShears.java +++ b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelShears.java @@ -41,8 +41,12 @@ public class ItemManasteelShears extends ItemShears implements IManaUsingItem { private static final int MANA_PER_DAMAGE = 30; public ItemManasteelShears() { + this(LibItemNames.MANASTEEL_SHEARS); + } + + public ItemManasteelShears(String name) { setCreativeTab(BotaniaCreativeTab.INSTANCE); - setUnlocalizedName(LibItemNames.MANASTEEL_SHEARS); + setUnlocalizedName(name); } @Override diff --git a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelShovel.java b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelShovel.java index 81eb0c1ae..e237f2c02 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelShovel.java +++ b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelShovel.java @@ -17,6 +17,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.Item; import net.minecraft.item.ItemSpade; import net.minecraft.item.ItemStack; +import net.minecraft.item.Item.ToolMaterial; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.mana.IManaUsingItem; @@ -34,9 +35,13 @@ public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem { private static final int MANA_PER_DAMAGE = 60; public ItemManasteelShovel() { - super(BotaniaAPI.manasteelToolMaterial); + this(BotaniaAPI.manasteelToolMaterial, LibItemNames.MANASTEEL_SHOVEL); + } + + public ItemManasteelShovel(ToolMaterial mat, String name) { + super(mat); setCreativeTab(BotaniaCreativeTab.INSTANCE); - setUnlocalizedName(LibItemNames.MANASTEEL_SHOVEL); + setUnlocalizedName(name); } @Override diff --git a/MODSRC/vazkii/botania/common/lib/LibItemNames.java b/MODSRC/vazkii/botania/common/lib/LibItemNames.java index 3b2cdd4e5..7e022f9c1 100644 --- a/MODSRC/vazkii/botania/common/lib/LibItemNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibItemNames.java @@ -65,6 +65,15 @@ public final class LibItemNames { public static final String ENDER_DAGGER = "enderDagger"; public static final String QUARTZ = "quartz"; public static final String WATER_ROD = "waterRod"; + public static final String ELEMENTIUM_HELM = "elementiumHelm"; + public static final String ELEMENTIUM_CHEST = "elementiumChest"; + public static final String ELEMENTIUM_LEGS = "elementiumLegs"; + public static final String ELEMENTIUM_BOOTS = "elementiumBoots"; + public static final String ELEMENTIUM_PICK = "elementiumPick"; + public static final String ELEMENTIUM_SHOVEL = "elementiumShovel"; + public static final String ELEMENTIUM_AXE = "elementiumAxe"; + public static final String ELEMENTIUM_SWORD = "elementiumSword"; + public static final String ELEMENTIUM_SHEARS = "elementiumShears"; 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 d6e374ad6..b38aaf864 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -466,6 +466,15 @@ item.botania:elementium.name=Elementium Ingot item.botania:pixieDust.name=Pixie Dust item.botania:dragonstone.name=Dragonstone item.botania:waterRod.name=Rod of the Seas +item.botania:elementiumHelm.name=Elementium Helmet +item.botania:elementiumChest.name=Elementium Chestplate +item.botania:elementiumLegs.name=Elementium Leggings +item.botania:elementiumBoots.name=Elementium Boots +item.botania:elementiumPick.name=Elementium Pickaxe +item.botania:elementiumShovel.name=Elementium Shovel +item.botania:elementiumAxe.name=Elementium Axe +item.botania:elementiumSword.name=Elementium Sword +item.botania:elementiumShears.name=Elementium Shears # GUI TEXT botania.gui.lexicon.header=Lexica Botania, %s Edition's Index - Pick which category you would like to study: diff --git a/resources/assets/botania/textures/items/elementiumAxe.png b/resources/assets/botania/textures/items/elementiumAxe.png index 3a1ce24cd..e96b38936 100644 Binary files a/resources/assets/botania/textures/items/elementiumAxe.png and b/resources/assets/botania/textures/items/elementiumAxe.png differ diff --git a/resources/assets/botania/textures/items/elementiumBoots.png b/resources/assets/botania/textures/items/elementiumBoots.png new file mode 100644 index 000000000..422645bd2 Binary files /dev/null and b/resources/assets/botania/textures/items/elementiumBoots.png differ diff --git a/resources/assets/botania/textures/items/elementiumChest.png b/resources/assets/botania/textures/items/elementiumChest.png new file mode 100644 index 000000000..e00610e20 Binary files /dev/null and b/resources/assets/botania/textures/items/elementiumChest.png differ diff --git a/resources/assets/botania/textures/items/elementiumHelm.png b/resources/assets/botania/textures/items/elementiumHelm.png new file mode 100644 index 000000000..3b6cd7849 Binary files /dev/null and b/resources/assets/botania/textures/items/elementiumHelm.png differ diff --git a/resources/assets/botania/textures/items/elementiumLegs.png b/resources/assets/botania/textures/items/elementiumLegs.png new file mode 100644 index 000000000..359c1ccb0 Binary files /dev/null and b/resources/assets/botania/textures/items/elementiumLegs.png differ diff --git a/resources/assets/botania/textures/items/elementiumPick.png b/resources/assets/botania/textures/items/elementiumPick.png index f32d8c50c..af7d77c00 100644 Binary files a/resources/assets/botania/textures/items/elementiumPick.png and b/resources/assets/botania/textures/items/elementiumPick.png differ diff --git a/resources/assets/botania/textures/items/elementiumShears.png b/resources/assets/botania/textures/items/elementiumShears.png index b3187994c..bb845a2f9 100644 Binary files a/resources/assets/botania/textures/items/elementiumShears.png and b/resources/assets/botania/textures/items/elementiumShears.png differ diff --git a/resources/assets/botania/textures/items/elementiumShovel.png b/resources/assets/botania/textures/items/elementiumShovel.png index 76e4fce60..2bd479a4e 100644 Binary files a/resources/assets/botania/textures/items/elementiumShovel.png and b/resources/assets/botania/textures/items/elementiumShovel.png differ diff --git a/resources/assets/botania/textures/items/elementiumSword.png b/resources/assets/botania/textures/items/elementiumSword.png new file mode 100644 index 000000000..14132069b Binary files /dev/null and b/resources/assets/botania/textures/items/elementiumSword.png differ diff --git a/resources/assets/botania/textures/items/openBucket.png b/resources/assets/botania/textures/items/openBucket.png new file mode 100644 index 000000000..4898aebc8 Binary files /dev/null and b/resources/assets/botania/textures/items/openBucket.png differ diff --git a/resources/assets/botania/textures/model/elementium0.png b/resources/assets/botania/textures/model/elementium0.png new file mode 100644 index 000000000..3cadcc283 Binary files /dev/null and b/resources/assets/botania/textures/model/elementium0.png differ diff --git a/resources/assets/botania/textures/model/elementium1.png b/resources/assets/botania/textures/model/elementium1.png new file mode 100644 index 000000000..2da7958e0 Binary files /dev/null and b/resources/assets/botania/textures/model/elementium1.png differ