diff --git a/MODSRC/vazkii/botania/api/BotaniaAPI.java b/MODSRC/vazkii/botania/api/BotaniaAPI.java index bae195d71..25922bef1 100644 --- a/MODSRC/vazkii/botania/api/BotaniaAPI.java +++ b/MODSRC/vazkii/botania/api/BotaniaAPI.java @@ -48,9 +48,12 @@ public final class BotaniaAPI { public static Map oreWeights = new HashMap(); - public static ArmorMaterial manasteelArmorMaterial = EnumHelper.addArmorMaterial("MANASTEEL", 16, new int[]{ 2, 6, 5, 2 }, 18); + 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 terrasteelArmorMaterial = EnumHelper.addArmorMaterial("TERRASTEEL", 34, new int[] {3, 8, 6, 3}, 26); + public static ToolMaterial terrasteelToolMaterial = EnumHelper.addToolMaterial("TERRASTEEL", 3, 1800, 8.6F, 3F, 26); + static { registerSubTile("", DummySubTile.class); diff --git a/MODSRC/vazkii/botania/client/lib/LibResources.java b/MODSRC/vazkii/botania/client/lib/LibResources.java index cc1fca38c..928500a66 100644 --- a/MODSRC/vazkii/botania/client/lib/LibResources.java +++ b/MODSRC/vazkii/botania/client/lib/LibResources.java @@ -52,6 +52,8 @@ public final class LibResources { 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_TERRASTEEL_0 = PREFIX_MODEL + "terrasteel0.png"; + public static final String MODEL_TERRASTEEL_1 = PREFIX_MODEL + "terrasteel1.png"; public static final String MODEL_CAPE = "/assets/botania/textures/model/cape.png"; diff --git a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java index 81fea05ce..b4e52ad01 100644 --- a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -82,7 +82,11 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.manasteelChest); addItem(ModItems.manasteelLegs); addItem(ModItems.manasteelBoots); - + addItem(ModItems.terrasteelHelm); + addItem(ModItems.terrasteelChest); + addItem(ModItems.terrasteelLegs); + addItem(ModItems.terrasteelBoots); + addItem(ModItems.manaTablet); addItem(ModItems.manaMirror); addBlock(ModBlocks.pool); diff --git a/MODSRC/vazkii/botania/common/item/ItemManaResource.java b/MODSRC/vazkii/botania/common/item/ItemManaResource.java index 496e06af0..d5b17dd80 100644 --- a/MODSRC/vazkii/botania/common/item/ItemManaResource.java +++ b/MODSRC/vazkii/botania/common/item/ItemManaResource.java @@ -23,7 +23,7 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemManaResource extends ItemMod { - final int types = 4; + final int types = 5; IIcon[] icons; public ItemManaResource() { diff --git a/MODSRC/vazkii/botania/common/item/ModItems.java b/MODSRC/vazkii/botania/common/item/ModItems.java index 737de7a66..afabf02b7 100644 --- a/MODSRC/vazkii/botania/common/item/ModItems.java +++ b/MODSRC/vazkii/botania/common/item/ModItems.java @@ -24,6 +24,10 @@ import vazkii.botania.common.item.tool.armor.ItemManasteelBoots; import vazkii.botania.common.item.tool.armor.ItemManasteelChest; import vazkii.botania.common.item.tool.armor.ItemManasteelHelm; import vazkii.botania.common.item.tool.armor.ItemManasteelLegs; +import vazkii.botania.common.item.tool.armor.ItemTerrasteelBoots; +import vazkii.botania.common.item.tool.armor.ItemTerrasteelChest; +import vazkii.botania.common.item.tool.armor.ItemTerrasteelHelm; +import vazkii.botania.common.item.tool.armor.ItemTerrasteelLegs; import vazkii.botania.common.lib.LibOreDict; public final class ModItems { @@ -45,6 +49,7 @@ public final class ModItems { public static Item grassSeeds; public static Item dirtRod; public static Item terraformRod; + public static Item grassHorn; public static Item manaMirror; public static Item manasteelHelm; public static Item manasteelChest; @@ -55,7 +60,10 @@ public final class ModItems { public static Item manasteelAxe; public static Item manasteelSword; public static Item manasteelShears; - public static Item grassHorn; + public static Item terrasteelHelm; + public static Item terrasteelChest; + public static Item terrasteelLegs; + public static Item terrasteelBoots; public static void init() { lexicon = new ItemLexicon(); @@ -75,6 +83,7 @@ public final class ModItems { grassSeeds = new ItemGrassSeeds(); dirtRod = new ItemDirtRod(); terraformRod = new ItemTerraformRod(); + grassHorn = new ItemGrassHorn(); manaMirror = new ItemManaMirror(); manasteelHelm = new ItemManasteelHelm(); manasteelChest = new ItemManasteelChest(); @@ -85,7 +94,10 @@ public final class ModItems { manasteelAxe = new ItemManasteelAxe(); manasteelSword = new ItemManasteelSword(); manasteelShears = new ItemManasteelShears(); - grassHorn = new ItemGrassHorn(); + terrasteelHelm = new ItemTerrasteelHelm(); + terrasteelChest = new ItemTerrasteelChest(); + terrasteelLegs = new ItemTerrasteelLegs(); + terrasteelBoots = new ItemTerrasteelBoots(); OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); for(int i = 0; i < 16; i++) { diff --git a/MODSRC/vazkii/botania/common/item/tool/armor/ItemManasteelArmor.java b/MODSRC/vazkii/botania/common/item/tool/armor/ItemManasteelArmor.java index 96f4164d1..ed6c91598 100644 --- a/MODSRC/vazkii/botania/common/item/tool/armor/ItemManasteelArmor.java +++ b/MODSRC/vazkii/botania/common/item/tool/armor/ItemManasteelArmor.java @@ -37,7 +37,11 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor { private static final int MANA_PER_DAMAGE = 70; public ItemManasteelArmor(int type, String name) { - super(BotaniaAPI.manasteelArmorMaterial, 0, type); + this(type, name, BotaniaAPI.manasteelArmorMaterial); + } + + public ItemManasteelArmor(int type, String name, ArmorMaterial mat) { + super(mat, 0, type); setCreativeTab(BotaniaCreativeTab.INSTANCE); setUnlocalizedName(name); } diff --git a/MODSRC/vazkii/botania/common/item/tool/armor/ItemTerrasteeelArmor.java b/MODSRC/vazkii/botania/common/item/tool/armor/ItemTerrasteeelArmor.java new file mode 100644 index 000000000..c0358a339 --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/tool/armor/ItemTerrasteeelArmor.java @@ -0,0 +1,48 @@ +/** + * 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 14, 2014, 2:58:13 PM (GMT)] + */ +package vazkii.botania.common.item.tool.armor; + +import java.util.UUID; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.ai.attributes.AttributeModifier; +import net.minecraft.item.ItemStack; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.client.lib.LibResources; + +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; + +public class ItemTerrasteeelArmor extends ItemManasteelArmor { + + public ItemTerrasteeelArmor(int type, String name) { + super(type, name, BotaniaAPI.terrasteelArmorMaterial); + } + + int getHealthBoost() { + return 0; + } + + @Override + public Multimap getItemAttributeModifiers() { + Multimap map = HashMultimap.create(); + map.put(SharedMonsterAttributes.maxHealth.getAttributeUnlocalizedName(), new AttributeModifier(new UUID(171328 /** Random number **/, armorType), "Armor modifier" + armorType, getHealthBoost(), 0)); + return map; + } + + @Override + public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { + return slot == 2 ? LibResources.MODEL_TERRASTEEL_1 : LibResources.MODEL_TERRASTEEL_0; + } + +} diff --git a/MODSRC/vazkii/botania/common/item/tool/armor/ItemTerrasteelBoots.java b/MODSRC/vazkii/botania/common/item/tool/armor/ItemTerrasteelBoots.java new file mode 100644 index 000000000..8ac351f9b --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/tool/armor/ItemTerrasteelBoots.java @@ -0,0 +1,27 @@ +/** + * 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 14, 2014, 3:14:11 PM (GMT)] + */ +package vazkii.botania.common.item.tool.armor; + +import vazkii.botania.common.lib.LibItemNames; + +public class ItemTerrasteelBoots extends ItemTerrasteeelArmor { + + public ItemTerrasteelBoots() { + super(3, LibItemNames.TERRASTEEL_BOOTS); + } + + @Override + int getHealthBoost() { + return 4; + } + +} diff --git a/MODSRC/vazkii/botania/common/item/tool/armor/ItemTerrasteelChest.java b/MODSRC/vazkii/botania/common/item/tool/armor/ItemTerrasteelChest.java new file mode 100644 index 000000000..1349dd7d5 --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/tool/armor/ItemTerrasteelChest.java @@ -0,0 +1,27 @@ +/** + * 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 14, 2014, 3:13:36 PM (GMT)] + */ +package vazkii.botania.common.item.tool.armor; + +import vazkii.botania.common.lib.LibItemNames; + +public class ItemTerrasteelChest extends ItemTerrasteeelArmor { + + public ItemTerrasteelChest() { + super(1, LibItemNames.TERRASTEEL_CHEST); + } + + @Override + int getHealthBoost() { + return 6; + } + +} diff --git a/MODSRC/vazkii/botania/common/item/tool/armor/ItemTerrasteelHelm.java b/MODSRC/vazkii/botania/common/item/tool/armor/ItemTerrasteelHelm.java new file mode 100644 index 000000000..e042de72e --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/tool/armor/ItemTerrasteelHelm.java @@ -0,0 +1,27 @@ +/** + * 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 14, 2014, 3:13:05 PM (GMT)] + */ +package vazkii.botania.common.item.tool.armor; + +import vazkii.botania.common.lib.LibItemNames; + +public class ItemTerrasteelHelm extends ItemTerrasteeelArmor { + + public ItemTerrasteelHelm() { + super(0, LibItemNames.TERRASTEEL_HELM); + } + + @Override + int getHealthBoost() { + return 5; + } + +} diff --git a/MODSRC/vazkii/botania/common/item/tool/armor/ItemTerrasteelLegs.java b/MODSRC/vazkii/botania/common/item/tool/armor/ItemTerrasteelLegs.java new file mode 100644 index 000000000..64dc10f28 --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/tool/armor/ItemTerrasteelLegs.java @@ -0,0 +1,27 @@ +/** + * 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 14, 2014, 3:13:49 PM (GMT)] + */ +package vazkii.botania.common.item.tool.armor; + +import vazkii.botania.common.lib.LibItemNames; + +public class ItemTerrasteelLegs extends ItemTerrasteeelArmor { + + public ItemTerrasteelLegs() { + super(2, LibItemNames.TERRASTEEL_LEGS); + } + + @Override + int getHealthBoost() { + return 5; + } + +} diff --git a/MODSRC/vazkii/botania/common/lib/LibItemNames.java b/MODSRC/vazkii/botania/common/lib/LibItemNames.java index 4c4500b42..479f680bb 100644 --- a/MODSRC/vazkii/botania/common/lib/LibItemNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibItemNames.java @@ -43,6 +43,10 @@ public final class LibItemNames { public static final String MANASTEEL_SWORD = LibResources.PREFIX_MOD + "manasteelSword"; public static final String MANASTEEL_SHEARS = LibResources.PREFIX_MOD + "manasteelShears"; public static final String GRASS_HORN = LibResources.PREFIX_MOD + "grassHorn"; + public static final String TERRASTEEL_HELM = LibResources.PREFIX_MOD + "terrasteelHelm"; + public static final String TERRASTEEL_CHEST = LibResources.PREFIX_MOD + "terrasteelChest"; + public static final String TERRASTEEL_LEGS = LibResources.PREFIX_MOD + "terrasteelLegs"; + public static final String TERRASTEEL_BOOTS = LibResources.PREFIX_MOD + "terrasteelBoots"; public static final String[] LENS_NAMES = new String[] { LibResources.PREFIX_MOD + "lensNormal", @@ -63,6 +67,7 @@ public final class LibItemNames { LibResources.PREFIX_MOD + "manasteel", LibResources.PREFIX_MOD + "manaPearl", LibResources.PREFIX_MOD + "manaDiamond", - LibResources.PREFIX_MOD + "livingwoodTwig" + LibResources.PREFIX_MOD + "livingwoodTwig", + LibResources.PREFIX_MOD + "terrasteel" }; } diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 4492fa063..d8751005f 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -270,6 +270,11 @@ item.botania:manasteelAxe.name=Manasteel Axe item.botania:manasteelSword.name=Manasteel Sword item.botania:manasteelShears.name=Manasteel Shears item.botania:grassHorn.name=Horn of the Wild +item.botania:terrasteel.name=Terrasteel Ingot +item.botania:terrasteelHelm.name=Terrasteel Helmet +item.botania:terrasteelChest.name=Terrasteel Chestplate +item.botania:terrasteelLegs.name=Terrasteel Leggings +item.botania:terrasteelBoots.name=Terrasteel 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/terrasteel.png b/resources/assets/botania/textures/items/terrasteel.png index 155dc6e5b..45302e577 100644 Binary files a/resources/assets/botania/textures/items/terrasteel.png and b/resources/assets/botania/textures/items/terrasteel.png differ diff --git a/resources/assets/botania/textures/items/terrasteelBoots.png b/resources/assets/botania/textures/items/terrasteelBoots.png new file mode 100644 index 000000000..7c8bd562b Binary files /dev/null and b/resources/assets/botania/textures/items/terrasteelBoots.png differ diff --git a/resources/assets/botania/textures/items/terrasteelChest.png b/resources/assets/botania/textures/items/terrasteelChest.png new file mode 100644 index 000000000..e6b1b2f86 Binary files /dev/null and b/resources/assets/botania/textures/items/terrasteelChest.png differ diff --git a/resources/assets/botania/textures/items/terrasteelHelm.png b/resources/assets/botania/textures/items/terrasteelHelm.png new file mode 100644 index 000000000..07384cae2 Binary files /dev/null and b/resources/assets/botania/textures/items/terrasteelHelm.png differ diff --git a/resources/assets/botania/textures/items/terrasteelLegs.png b/resources/assets/botania/textures/items/terrasteelLegs.png new file mode 100644 index 000000000..b95c58f27 Binary files /dev/null and b/resources/assets/botania/textures/items/terrasteelLegs.png differ diff --git a/resources/assets/botania/textures/model/terrasteel0.png b/resources/assets/botania/textures/model/terrasteel0.png new file mode 100644 index 000000000..6ed36b933 Binary files /dev/null and b/resources/assets/botania/textures/model/terrasteel0.png differ diff --git a/resources/assets/botania/textures/model/terrasteel1.png b/resources/assets/botania/textures/model/terrasteel1.png new file mode 100644 index 000000000..b578498e3 Binary files /dev/null and b/resources/assets/botania/textures/model/terrasteel1.png differ