diff --git a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java index 9c056c84b..b205366ae 100644 --- a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -62,7 +62,6 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.dirtRod); addItem(ModItems.terraformRod); - addItem(ModItems.timeRod); addBlock(ModBlocks.livingrock); addBlock(ModBlocks.livingwood); diff --git a/MODSRC/vazkii/botania/common/item/ModItems.java b/MODSRC/vazkii/botania/common/item/ModItems.java index 510e397b9..3fe606f0c 100644 --- a/MODSRC/vazkii/botania/common/item/ModItems.java +++ b/MODSRC/vazkii/botania/common/item/ModItems.java @@ -17,13 +17,15 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.common.item.magic.ItemDirtRod; import vazkii.botania.common.item.magic.ItemTerraformRod; -import vazkii.botania.common.item.tool.ItemManasteelArmor; import vazkii.botania.common.item.tool.ItemManasteelAxe; import vazkii.botania.common.item.tool.ItemManasteelPick; import vazkii.botania.common.item.tool.ItemManasteelShears; import vazkii.botania.common.item.tool.ItemManasteelShovel; import vazkii.botania.common.item.tool.ItemManasteelSword; -import vazkii.botania.common.lib.LibItemNames; +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.lib.LibOreDict; public final class ModItems { @@ -43,7 +45,6 @@ public final class ModItems { public static Item manaCookie; public static Item fertilizer; public static Item grassSeeds; - public static Item timeRod; public static Item dirtRod; public static Item terraformRod; public static Item manaMirror; @@ -76,10 +77,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); + manasteelHelm = new ItemManasteelHelm(); + manasteelChest = new ItemManasteelChest(); + manasteelLegs = new ItemManasteelLegs(); + manasteelBoots = new ItemManasteelBoots(); manasteelPick = new ItemManasteelPick(); manasteelShovel = new ItemManasteelShovel(); manasteelAxe = new ItemManasteelAxe(); diff --git a/MODSRC/vazkii/botania/common/item/tool/ItemManasteelArmor.java b/MODSRC/vazkii/botania/common/item/tool/armor/ItemManasteelArmor.java similarity index 96% rename from MODSRC/vazkii/botania/common/item/tool/ItemManasteelArmor.java rename to MODSRC/vazkii/botania/common/item/tool/armor/ItemManasteelArmor.java index c0c82cb9f..96f4164d1 100644 --- a/MODSRC/vazkii/botania/common/item/tool/ItemManasteelArmor.java +++ b/MODSRC/vazkii/botania/common/item/tool/armor/ItemManasteelArmor.java @@ -9,13 +9,14 @@ * * File Created @ [Apr 13, 2014, 6:38:21 PM (GMT)] */ -package vazkii.botania.common.item.tool; +package vazkii.botania.common.item.tool.armor; import vazkii.botania.api.BotaniaAPI; 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 vazkii.botania.common.item.tool.ManasteelToolCommons; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/MODSRC/vazkii/botania/common/item/tool/armor/ItemManasteelBoots.java b/MODSRC/vazkii/botania/common/item/tool/armor/ItemManasteelBoots.java new file mode 100644 index 000000000..a4519b575 --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/tool/armor/ItemManasteelBoots.java @@ -0,0 +1,22 @@ +/** + * 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, 10:24:08 PM (GMT)] + */ +package vazkii.botania.common.item.tool.armor; + +import vazkii.botania.common.lib.LibItemNames; + +public class ItemManasteelBoots extends ItemManasteelArmor { + + public ItemManasteelBoots() { + super(3, LibItemNames.MANASTEEL_BOOTS); + } + +} diff --git a/MODSRC/vazkii/botania/common/item/tool/armor/ItemManasteelChest.java b/MODSRC/vazkii/botania/common/item/tool/armor/ItemManasteelChest.java new file mode 100644 index 000000000..1c962e399 --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/tool/armor/ItemManasteelChest.java @@ -0,0 +1,22 @@ +/** + * 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, 10:22:57 PM (GMT)] + */ +package vazkii.botania.common.item.tool.armor; + +import vazkii.botania.common.lib.LibItemNames; + +public class ItemManasteelChest extends ItemManasteelArmor { + + public ItemManasteelChest() { + super(1, LibItemNames.MANASTEEL_CHEST); + } + +} diff --git a/MODSRC/vazkii/botania/common/item/tool/armor/ItemManasteelHelm.java b/MODSRC/vazkii/botania/common/item/tool/armor/ItemManasteelHelm.java new file mode 100644 index 000000000..4933b4967 --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/tool/armor/ItemManasteelHelm.java @@ -0,0 +1,22 @@ +/** + * 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, 10:22:24 PM (GMT)] + */ +package vazkii.botania.common.item.tool.armor; + +import vazkii.botania.common.lib.LibItemNames; + +public class ItemManasteelHelm extends ItemManasteelArmor { + + public ItemManasteelHelm() { + super(0, LibItemNames.MANASTEEL_HELM); + } + +} diff --git a/MODSRC/vazkii/botania/common/item/tool/armor/ItemManasteelLegs.java b/MODSRC/vazkii/botania/common/item/tool/armor/ItemManasteelLegs.java new file mode 100644 index 000000000..8ffd0c21f --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/tool/armor/ItemManasteelLegs.java @@ -0,0 +1,22 @@ +/** + * 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, 10:23:28 PM (GMT)] + */ +package vazkii.botania.common.item.tool.armor; + +import vazkii.botania.common.lib.LibItemNames; + +public class ItemManasteelLegs extends ItemManasteelArmor { + + public ItemManasteelLegs() { + super(2, LibItemNames.MANASTEEL_LEGS); + } + +}