Added the Elementium tool/armor set that doesn't do anything (yet).

This commit is contained in:
Vasco Lavos committed 2014-06-18 14:26:04 +01:00
1 parent 5441642872
commit 309ae7d0fe
41 files changed
+229 -26

No files matched your search

@@ -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);
@@ -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";
@@ -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);
@@ -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++) {
@@ -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);
}
}
@@ -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);
}
}
@@ -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);
}
}
@@ -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);
}
}
@@ -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);
}
}
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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);
}
}
@@ -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);
}
}
@@ -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);
}
}
@@ -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);
}
}
@@ -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);
}
}
@@ -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
@@ -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
@@ -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
@@ -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",
+9
View File
@@ -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:
Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB