diff --git a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java index 558a8b06c..948994dd0 100644 --- a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -48,6 +48,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.dye); addItem(ModItems.twigWand); addItem(ModItems.manaResource); + addItem(ModItems.rune); addBlock(ModBlocks.livingrock); addBlock(ModBlocks.livingwood); diff --git a/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java b/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java index 70eea4dd5..22c97f6e0 100644 --- a/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java @@ -48,6 +48,7 @@ public final class ConfigHandler { LibItemIDs.idManaResource = loadItem(LibItemNames.MANA_RESOURCE, LibItemIDs.idManaResource); LibItemIDs.idLens = loadItem(LibItemNames.LENS, LibItemIDs.idLens); LibItemIDs.idManaPetal = loadItem(LibItemNames.MANA_PETAL, LibItemIDs.idManaPetal); + LibItemIDs.idRune = loadItem(LibItemNames.RUNE, LibItemIDs.idRune); config.save(); } diff --git a/MODSRC/vazkii/botania/common/item/ItemRune.java b/MODSRC/vazkii/botania/common/item/ItemRune.java new file mode 100644 index 000000000..5d656ff14 --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/ItemRune.java @@ -0,0 +1,61 @@ +/** + * 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 @ [Feb 7, 2014, 9:46:24 PM (GMT)] + */ +package vazkii.botania.common.item; + +import java.util.List; + +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.common.lib.LibItemIDs; +import vazkii.botania.common.lib.LibItemNames; + +public class ItemRune extends ItemMod { + + Icon[] icons; + + public ItemRune() { + super(LibItemIDs.idRune); + setHasSubtypes(true); + setUnlocalizedName(LibItemNames.RUNE); + } + + @Override + public void registerIcons(IconRegister par1IconRegister) { + icons = new Icon[16]; + for(int i = 0; i < icons.length; i++) + icons[i] = IconHelper.forItem(par1IconRegister, this, i); + } + + @Override + public Icon getIconFromDamage(int par1) { + return icons[Math.min(icons.length - 1, par1)]; + } + + @Override + public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List) { + for(int i = 0; i < 16; i++) + par3List.add(new ItemStack(par1, 1, i)); + } + + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage(); + } + + String getUnlocalizedNameLazy(ItemStack par1ItemStack) { + return super.getUnlocalizedName(par1ItemStack); + } + +} diff --git a/MODSRC/vazkii/botania/common/item/ModItems.java b/MODSRC/vazkii/botania/common/item/ModItems.java index f43af65c5..1e30a37e8 100644 --- a/MODSRC/vazkii/botania/common/item/ModItems.java +++ b/MODSRC/vazkii/botania/common/item/ModItems.java @@ -26,6 +26,7 @@ public final class ModItems { public static Item manaResource; public static Item lens; public static Item manaPetal; + public static Item rune; public static void init() { lexicon = new ItemLexicon(); @@ -36,12 +37,14 @@ public final class ModItems { manaResource = new ItemManaResource(); lens = new ItemLens(); manaPetal = new ItemManaPetal(); + rune = new ItemRune(); OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); for(int i = 0; i < 16; i++) { OreDictionary.registerOre(LibOreDict.PETAL[i], new ItemStack(petal.itemID, 1, i)); OreDictionary.registerOre(LibOreDict.DYE[i], new ItemStack(dye.itemID, 1, i)); OreDictionary.registerOre(LibOreDict.MANA_PETAL[i], new ItemStack(manaPetal.itemID, 1, i)); + OreDictionary.registerOre(LibOreDict.RUNE[i], new ItemStack(rune.itemID, 1, i)); } OreDictionary.registerOre(LibOreDict.PESTLE_AND_MORTAR, pestleAndMortar); OreDictionary.registerOre(LibOreDict.MANA_STEEL, new ItemStack(manaResource, 1, 0)); diff --git a/MODSRC/vazkii/botania/common/lib/LibItemIDs.java b/MODSRC/vazkii/botania/common/lib/LibItemIDs.java index f6441576e..b2e18dd46 100644 --- a/MODSRC/vazkii/botania/common/lib/LibItemIDs.java +++ b/MODSRC/vazkii/botania/common/lib/LibItemIDs.java @@ -21,5 +21,6 @@ public final class LibItemIDs { public static int idManaResource = 19560; public static int idLens = 19562; public static int idManaPetal = 19563; + public static int idRune = 19564; } diff --git a/MODSRC/vazkii/botania/common/lib/LibItemNames.java b/MODSRC/vazkii/botania/common/lib/LibItemNames.java index b8549e633..f95c0995a 100644 --- a/MODSRC/vazkii/botania/common/lib/LibItemNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibItemNames.java @@ -23,6 +23,7 @@ public final class LibItemNames { public static final String MANA_RESOURCE = LibResources.PREFIX_MOD + "manaResource"; public static final String LENS = LibResources.PREFIX_MOD + "lens"; public static final String MANA_PETAL = LibResources.PREFIX_MOD + "manaPetal"; + public static final String RUNE = LibResources.PREFIX_MOD + "rune"; public static final String[] LENS_NAMES = new String[] { LibResources.PREFIX_MOD + "lensNormal", diff --git a/MODSRC/vazkii/botania/common/lib/LibOreDict.java b/MODSRC/vazkii/botania/common/lib/LibOreDict.java index 037360ad2..d40428d86 100644 --- a/MODSRC/vazkii/botania/common/lib/LibOreDict.java +++ b/MODSRC/vazkii/botania/common/lib/LibOreDict.java @@ -37,4 +37,8 @@ public final class LibOreDict { public static final String[] MANA_PETAL = new String[] { "manaPetalWhite", "manaPetalOrange", "manaPetalMagenta", "manaPetalLightBlue", "manaPetalYellow", "manaPetalLime", "manaPetalPink", "manaPetalGray", "manaPetalLightGray", "manaPetalCyan", "manaPetalPurple", "manaPetalBlue", "manaPetalBrown", "manaPetalGreen", "manaPetalRed", "manaPetalBlack", }; + + public static final String[] RUNE = new String[] { + "runeWaterB", "runeFireB", "runeEarthB", "runeAirB", "runeSpringB", "runeSummerB", "runeAutumnB", "runeWinterB", "runeManaB", "runeLustB", "runeGluttonyB", "runeGreedB", "runeSlothB", "runeWrathB", "runeEnvyB", "runePrideB" + }; } diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 898160030..bf57b10a7 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -138,6 +138,22 @@ item.botania:manaPetal12.name=Brown Mana Petal item.botania:manaPetal13.name=Green Mana Petal item.botania:manaPetal14.name=Red Mana Petal item.botania:manaPetal15.name=Black Mana Petal +item.botania:rune0.name=Rune of Water +item.botania:rune1.name=Rune of Fire +item.botania:rune2.name=Rune of Earth +item.botania:rune3.name=Rune of Air +item.botania:rune4.name=Rune of Spring +item.botania:rune5.name=Rune of Summer +item.botania:rune6.name=Rune of Autumn +item.botania:rune7.name=Rune of Winter +item.botania:rune8.name=Rune of Mana +item.botania:rune9.name=Rune of Lust +item.botania:rune10.name=Rune of Gluttony +item.botania:rune11.name=Rune of Greed +item.botania:rune12.name=Rune of Sloth +item.botania:rune13.name=Rune of Wrath +item.botania:rune14.name=Rune of Envy +item.botania:rune15.name=Rune of Pride # 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/borderedRune.png b/resources/assets/botania/textures/items/borderedRune.png deleted file mode 100644 index 564b75e00..000000000 Binary files a/resources/assets/botania/textures/items/borderedRune.png and /dev/null differ diff --git a/resources/assets/botania/textures/items/borderlessRune.png b/resources/assets/botania/textures/items/borderlessRune.png deleted file mode 100644 index 6d78fd673..000000000 Binary files a/resources/assets/botania/textures/items/borderlessRune.png and /dev/null differ diff --git a/resources/assets/botania/textures/items/rune0.png b/resources/assets/botania/textures/items/rune0.png new file mode 100644 index 000000000..d0a8f59e6 Binary files /dev/null and b/resources/assets/botania/textures/items/rune0.png differ diff --git a/resources/assets/botania/textures/items/rune1.png b/resources/assets/botania/textures/items/rune1.png new file mode 100644 index 000000000..cb8595b05 Binary files /dev/null and b/resources/assets/botania/textures/items/rune1.png differ diff --git a/resources/assets/botania/textures/items/rune10.png b/resources/assets/botania/textures/items/rune10.png new file mode 100644 index 000000000..1cc40edb4 Binary files /dev/null and b/resources/assets/botania/textures/items/rune10.png differ diff --git a/resources/assets/botania/textures/items/rune11.png b/resources/assets/botania/textures/items/rune11.png new file mode 100644 index 000000000..87f126871 Binary files /dev/null and b/resources/assets/botania/textures/items/rune11.png differ diff --git a/resources/assets/botania/textures/items/rune12.png b/resources/assets/botania/textures/items/rune12.png new file mode 100644 index 000000000..edae6d621 Binary files /dev/null and b/resources/assets/botania/textures/items/rune12.png differ diff --git a/resources/assets/botania/textures/items/rune13.png b/resources/assets/botania/textures/items/rune13.png new file mode 100644 index 000000000..ac8303cd0 Binary files /dev/null and b/resources/assets/botania/textures/items/rune13.png differ diff --git a/resources/assets/botania/textures/items/rune14.png b/resources/assets/botania/textures/items/rune14.png new file mode 100644 index 000000000..154b8d843 Binary files /dev/null and b/resources/assets/botania/textures/items/rune14.png differ diff --git a/resources/assets/botania/textures/items/rune15.png b/resources/assets/botania/textures/items/rune15.png new file mode 100644 index 000000000..77fc7824c Binary files /dev/null and b/resources/assets/botania/textures/items/rune15.png differ diff --git a/resources/assets/botania/textures/items/rune2.png b/resources/assets/botania/textures/items/rune2.png new file mode 100644 index 000000000..758dd7d84 Binary files /dev/null and b/resources/assets/botania/textures/items/rune2.png differ diff --git a/resources/assets/botania/textures/items/rune3.png b/resources/assets/botania/textures/items/rune3.png new file mode 100644 index 000000000..d33c9769b Binary files /dev/null and b/resources/assets/botania/textures/items/rune3.png differ diff --git a/resources/assets/botania/textures/items/rune4.png b/resources/assets/botania/textures/items/rune4.png new file mode 100644 index 000000000..4fa0bbbb0 Binary files /dev/null and b/resources/assets/botania/textures/items/rune4.png differ diff --git a/resources/assets/botania/textures/items/rune5.png b/resources/assets/botania/textures/items/rune5.png new file mode 100644 index 000000000..7f07ef13b Binary files /dev/null and b/resources/assets/botania/textures/items/rune5.png differ diff --git a/resources/assets/botania/textures/items/rune6.png b/resources/assets/botania/textures/items/rune6.png new file mode 100644 index 000000000..f8da03667 Binary files /dev/null and b/resources/assets/botania/textures/items/rune6.png differ diff --git a/resources/assets/botania/textures/items/rune7.png b/resources/assets/botania/textures/items/rune7.png new file mode 100644 index 000000000..34df98e70 Binary files /dev/null and b/resources/assets/botania/textures/items/rune7.png differ diff --git a/resources/assets/botania/textures/items/rune8.png b/resources/assets/botania/textures/items/rune8.png new file mode 100644 index 000000000..cde944596 Binary files /dev/null and b/resources/assets/botania/textures/items/rune8.png differ diff --git a/resources/assets/botania/textures/items/rune9.png b/resources/assets/botania/textures/items/rune9.png new file mode 100644 index 000000000..6a44b379f Binary files /dev/null and b/resources/assets/botania/textures/items/rune9.png differ