diff --git a/MODSRC/vazkii/botania/client/lib/LibResources.java b/MODSRC/vazkii/botania/client/lib/LibResources.java index fc15e834f..cc1fca38c 100644 --- a/MODSRC/vazkii/botania/client/lib/LibResources.java +++ b/MODSRC/vazkii/botania/client/lib/LibResources.java @@ -50,6 +50,9 @@ public final class LibResources { public static final String MODEL_PYLON_OLD = PREFIX_MODEL + "pylonOld.png"; public static final String MODEL_PYLON = PREFIX_MODEL + "pylon.png"; public static final String MODEL_LEXICA = PREFIX_MODEL + "lexica.png"; + public static final String MODEL_MANASTEEL_0 = PREFIX_MODEL + "manasteel0.png"; + public static final String MODEL_MANASTEEL_1 = PREFIX_MODEL + "manasteel1.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/item/ModItems.java b/MODSRC/vazkii/botania/common/item/ModItems.java index 764223795..856909a4d 100644 --- a/MODSRC/vazkii/botania/common/item/ModItems.java +++ b/MODSRC/vazkii/botania/common/item/ModItems.java @@ -18,6 +18,8 @@ import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.common.item.magic.ItemDirtRod; import vazkii.botania.common.item.magic.ItemTerraformRod; import vazkii.botania.common.item.magic.ItemTimeRod; +import vazkii.botania.common.item.tool.ItemManasteelArmor; +import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibOreDict; public final class ModItems { @@ -41,6 +43,10 @@ public final class ModItems { public static Item dirtRod; public static Item terraformRod; public static Item manaMirror; + public static Item manasteelHelm; + public static Item manasteelChest; + public static Item manasteelLegs; + public static Item manasteelBoots; public static void init() { lexicon = new ItemLexicon(); @@ -62,6 +68,10 @@ public final class ModItems { dirtRod = new ItemDirtRod(); terraformRod = new ItemTerraformRod(); manaMirror = new ItemManaMirror(); + manasteelHelm = new ItemManasteelArmor(0, LibItemNames.MANASTEEL_HELM); + manasteelChest = new ItemManasteelArmor(1, LibItemNames.MANASTEEL_CHEST); + manasteelLegs = new ItemManasteelArmor(2, LibItemNames.MANASTEEL_LEGS); + manasteelBoots = new ItemManasteelArmor(3, LibItemNames.MANASTEEL_BOOTS); OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); for(int i = 0; i < 16; i++) { diff --git a/MODSRC/vazkii/botania/common/item/tool/ItemManasteelArmor.java b/MODSRC/vazkii/botania/common/item/tool/ItemManasteelArmor.java new file mode 100644 index 000000000..ba825889a --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/tool/ItemManasteelArmor.java @@ -0,0 +1,80 @@ +/** + * 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 @ [Apr 13, 2014, 6:38:21 PM (GMT)] + */ +package vazkii.botania.common.item.tool; + +import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.core.BotaniaCreativeTab; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemStack; +import net.minecraft.util.DamageSource; +import net.minecraftforge.common.ISpecialArmor; +import net.minecraftforge.common.ISpecialArmor.ArmorProperties; + +public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor { + + private static final int MANA_PER_DAMAGE = 70; + + public ItemManasteelArmor(int type, String name) { + super(ArmorMaterial.IRON, 0, type); + setCreativeTab(BotaniaCreativeTab.INSTANCE); + setUnlocalizedName(name); + } + + @Override + public Item setUnlocalizedName(String par1Str) { + GameRegistry.registerItem(this, par1Str); + return super.setUnlocalizedName(par1Str); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister par1IconRegister) { + itemIcon = IconHelper.forItem(par1IconRegister, this); + } + + @Override + public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) { + return new ArmorProperties(0, damageReduceAmount / 25D, armor.getMaxDamage() + 1 - armor.getItemDamage()); + } + + @Override + public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) { + return damageReduceAmount; + } + + @Override + public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) { + System.out.println(damage); + int manaToRequest = damage * MANA_PER_DAMAGE; + int manaRequested = entity instanceof EntityPlayer ? ManaItemHandler.requestMana(stack, (EntityPlayer) entity, manaToRequest, true) : 0; + + int finalDamage = damage - manaRequested / MANA_PER_DAMAGE; + if(finalDamage > 0) + stack.damageItem(finalDamage, entity); + } + + @Override + public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { + return slot == 2 ? LibResources.MODEL_MANASTEEL_1 : LibResources.MODEL_MANASTEEL_0; + } + +} diff --git a/MODSRC/vazkii/botania/common/lib/LibItemNames.java b/MODSRC/vazkii/botania/common/lib/LibItemNames.java index 919e2fcf5..eab32d473 100644 --- a/MODSRC/vazkii/botania/common/lib/LibItemNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibItemNames.java @@ -34,6 +34,10 @@ public final class LibItemNames { public static final String DIRT_ROD = LibResources.PREFIX_MOD + "dirtRod"; public static final String TERRAFORM_ROD = LibResources.PREFIX_MOD + "terraformRod"; public static final String MANA_MIRROR = LibResources.PREFIX_MOD + "manaMirror"; + public static final String MANASTEEL_HELM = LibResources.PREFIX_MOD + "manasteelHelm"; + public static final String MANASTEEL_CHEST = LibResources.PREFIX_MOD + "manasteelChest"; + public static final String MANASTEEL_LEGS = LibResources.PREFIX_MOD + "manasteelLegs"; + public static final String MANASTEEL_BOOTS = LibResources.PREFIX_MOD + "manasteelBoots"; public static final String[] LENS_NAMES = new String[] { LibResources.PREFIX_MOD + "lensNormal", diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 97dfb114d..0c3956046 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -261,6 +261,10 @@ item.botania:timeRod.name=Rod of Flowing Time [NYI] item.botania:dirtRod.name=Rod of the Lands item.botania:terraformRod.name=Terra Firma Rod item.botania:manaMirror.name=Mana Mirror +item.botania:manasteelHelm.name=Manasteel Helm +item.botania:manasteelChest.name=Manasteel Breastplate +item.botania:manasteelLegs.name=Manasteel Platelegs +item.botania:manasteelBoots.name=Manasteel Boots # 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/manaSword.png b/resources/assets/botania/textures/items/manaSword.png new file mode 100644 index 000000000..3bba9cf6e Binary files /dev/null and b/resources/assets/botania/textures/items/manaSword.png differ diff --git a/resources/assets/botania/textures/items/manasteelAxe.png b/resources/assets/botania/textures/items/manasteelAxe.png new file mode 100644 index 000000000..b98044c34 Binary files /dev/null and b/resources/assets/botania/textures/items/manasteelAxe.png differ diff --git a/resources/assets/botania/textures/items/manasteelBoots.png b/resources/assets/botania/textures/items/manasteelBoots.png new file mode 100644 index 000000000..0d19241ae Binary files /dev/null and b/resources/assets/botania/textures/items/manasteelBoots.png differ diff --git a/resources/assets/botania/textures/items/manasteelChest.png b/resources/assets/botania/textures/items/manasteelChest.png new file mode 100644 index 000000000..0937954e1 Binary files /dev/null and b/resources/assets/botania/textures/items/manasteelChest.png differ diff --git a/resources/assets/botania/textures/items/manasteelHelm.png b/resources/assets/botania/textures/items/manasteelHelm.png new file mode 100644 index 000000000..72b2dcaa4 Binary files /dev/null and b/resources/assets/botania/textures/items/manasteelHelm.png differ diff --git a/resources/assets/botania/textures/items/manasteelLegs.png b/resources/assets/botania/textures/items/manasteelLegs.png new file mode 100644 index 000000000..0f09238d3 Binary files /dev/null and b/resources/assets/botania/textures/items/manasteelLegs.png differ diff --git a/resources/assets/botania/textures/items/manasteelPickaxe.png b/resources/assets/botania/textures/items/manasteelPickaxe.png new file mode 100644 index 000000000..98929769d Binary files /dev/null and b/resources/assets/botania/textures/items/manasteelPickaxe.png differ diff --git a/resources/assets/botania/textures/items/manasteelShears.png b/resources/assets/botania/textures/items/manasteelShears.png new file mode 100644 index 000000000..ea3a3e0ec Binary files /dev/null and b/resources/assets/botania/textures/items/manasteelShears.png differ diff --git a/resources/assets/botania/textures/items/manasteelShovel.png b/resources/assets/botania/textures/items/manasteelShovel.png new file mode 100644 index 000000000..6ab0d251b Binary files /dev/null and b/resources/assets/botania/textures/items/manasteelShovel.png differ diff --git a/resources/assets/botania/textures/model/manasteel0.png b/resources/assets/botania/textures/model/manasteel0.png new file mode 100644 index 000000000..73cbebecb Binary files /dev/null and b/resources/assets/botania/textures/model/manasteel0.png differ diff --git a/resources/assets/botania/textures/model/manasteel1.png b/resources/assets/botania/textures/model/manasteel1.png new file mode 100644 index 000000000..f8a8d98a3 Binary files /dev/null and b/resources/assets/botania/textures/model/manasteel1.png differ diff --git a/resources/mcmod.info b/resources/mcmod.info index a590487ad..a700163d2 100644 --- a/resources/mcmod.info +++ b/resources/mcmod.info @@ -9,7 +9,7 @@ "url": "http://www.vazkii.us", "updateUrl": "", "authorList": ["Vazkii"], - "credits": "Azanor, dylan4ever, wiiv, Rorax, MegaManki, mDiyo, Mikeemoo, ChickenBones, cpw", + "credits": "Azanor, dylan4ever, wiiv, Rorax, Auric245524, MegaManki, mDiyo, Mikeemoo, ChickenBones, cpw", "parent": "", "screenshots": [], "dependencies": []