diff --git a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java index e2488cf85..e833dad40 100644 --- a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -49,6 +49,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.dye); addItem(ModItems.twigWand); addItem(ModItems.manaResource); + addItem(ModItems.manaCookie); addItem(ModItems.rune); addBlock(ModBlocks.livingrock); diff --git a/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java b/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java index fc72b13ca..a132252be 100644 --- a/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java @@ -82,6 +82,7 @@ public final class ConfigHandler { LibItemIDs.idSignalFlare = loadItem(LibItemNames.SIGNAL_FLARE, LibItemIDs.idSignalFlare); LibItemIDs.idManaTablet = loadItem(LibItemNames.MANA_TABLET, LibItemIDs.idManaTablet); LibItemIDs.idManaGun = loadItem(LibItemNames.MANA_GUN, LibItemIDs.idManaGun); + LibItemIDs.idManaCookie = loadItem(LibItemNames.MANA_COOKIE, LibItemIDs.idManaCookie); config.save(); } diff --git a/MODSRC/vazkii/botania/common/crafting/ModManaInfusionRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModManaInfusionRecipes.java index b41c5793e..80c5bd463 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModManaInfusionRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModManaInfusionRecipes.java @@ -30,6 +30,7 @@ public final class ModManaInfusionRecipes { public static RecipeManaInfusion manaPearlRecipe; public static RecipeManaInfusion manaDiamondRecipe; public static RecipeManaInfusion pistonRelayRecipe; + public static RecipeManaInfusion manaCookieRecipe; public static void init() { manaPetalRecipes = new ArrayList(); @@ -40,6 +41,7 @@ public final class ModManaInfusionRecipes { manaPearlRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 1), new ItemStack(Item.enderPearl), 6000); manaDiamondRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 2), "gemDiamond", 10000); pistonRelayRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.pistonRelay), new ItemStack(Block.pistonBase), 15000); + manaCookieRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaCookie), new ItemStack(Item.cookie), 20000); } } diff --git a/MODSRC/vazkii/botania/common/item/ItemManaCookie.java b/MODSRC/vazkii/botania/common/item/ItemManaCookie.java new file mode 100644 index 000000000..39e2f7bc7 --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/ItemManaCookie.java @@ -0,0 +1,47 @@ +/** + * 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 @ [Mar 21, 2014, 8:44:35 PM (GMT)] + */ +package vazkii.botania.common.item; + +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.item.Item; +import net.minecraft.item.ItemFood; +import net.minecraft.potion.Potion; +import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.common.core.BotaniaCreativeTab; +import vazkii.botania.common.lib.LibItemIDs; +import vazkii.botania.common.lib.LibItemNames; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class ItemManaCookie extends ItemFood { + + public ItemManaCookie() { + super(LibItemIDs.idManaCookie, 0, 0.1F, false); + setPotionEffect(Potion.field_76443_y.id, 1, 0, 1F); + setCreativeTab(BotaniaCreativeTab.INSTANCE); + setUnlocalizedName(LibItemNames.MANA_COOKIE); + } + + @Override + public Item setUnlocalizedName(String par1Str) { + GameRegistry.registerItem(this, par1Str); + return super.setUnlocalizedName(par1Str); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IconRegister par1IconRegister) { + itemIcon = IconHelper.forItem(par1IconRegister, this); + } + +} diff --git a/MODSRC/vazkii/botania/common/item/ModItems.java b/MODSRC/vazkii/botania/common/item/ModItems.java index 1f3e965d1..6734506ff 100644 --- a/MODSRC/vazkii/botania/common/item/ModItems.java +++ b/MODSRC/vazkii/botania/common/item/ModItems.java @@ -30,6 +30,7 @@ public final class ModItems { public static Item signalFlare; public static Item manaTablet; public static Item manaGun; + public static Item manaCookie; public static void init() { lexicon = new ItemLexicon(); @@ -44,7 +45,8 @@ public final class ModItems { signalFlare = new ItemSignalFlare(); manaTablet = new ItemManaTablet(); manaGun = new ItemManaGun(); - + manaCookie = new ItemManaCookie(); + OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); for(int i = 0; i < 16; i++) { OreDictionary.registerOre(LibOreDict.PETAL[i], new ItemStack(petal.itemID, 1, i)); diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index d1db0848f..316e1e576 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -136,7 +136,7 @@ public final class LexiconData { spreader.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_SPREADER), new PageText("2"), new PageText("3"), new PageText("4"), new PageCraftingRecipe("5", ModCrafingRecipes.recipesSpreader), new PageText("6"), new PageCraftingRecipe("7", ModCrafingRecipes.recipeManaLens), new PageCraftingRecipe("8", ModCrafingRecipes.recipesLensDying), new PageCraftingRecipe("9", ModCrafingRecipes.recipeRainbowLens)); pool = new BLexiconEntry(LibLexicon.MANA_POOL, categoryMana); - pool.setPriority().setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipePool), new PageText("2"), new PageManaInfusionRecipe("3", ModManaInfusionRecipes.manasteelRecipe), new PageManaInfusionRecipe("4", ModManaInfusionRecipes.manaPearlRecipe), new PageManaInfusionRecipe("5", ModManaInfusionRecipes.manaDiamondRecipe), new PageManaInfusionRecipe("6", ModManaInfusionRecipes.manaPetalRecipes)); + pool.setPriority().setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipePool), new PageText("2"), new PageManaInfusionRecipe("3", ModManaInfusionRecipes.manasteelRecipe), new PageManaInfusionRecipe("4", ModManaInfusionRecipes.manaPearlRecipe), new PageManaInfusionRecipe("5", ModManaInfusionRecipes.manaDiamondRecipe), new PageManaInfusionRecipe("6", ModManaInfusionRecipes.manaPetalRecipes), new PageManaInfusionRecipe("7", ModManaInfusionRecipes.manaCookieRecipe)); distributor = new BLexiconEntry(LibLexicon.MANA_DISTRIBUTOR, categoryMana); distributor.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeDistributor)); diff --git a/MODSRC/vazkii/botania/common/lib/LibItemIDs.java b/MODSRC/vazkii/botania/common/lib/LibItemIDs.java index 302e68554..f5f611d5d 100644 --- a/MODSRC/vazkii/botania/common/lib/LibItemIDs.java +++ b/MODSRC/vazkii/botania/common/lib/LibItemIDs.java @@ -25,5 +25,6 @@ public final class LibItemIDs { public static int idSignalFlare = 19565; public static int idManaTablet = 19566; public static int idManaGun = 19567; + public static int idManaCookie = 19568; } diff --git a/MODSRC/vazkii/botania/common/lib/LibItemNames.java b/MODSRC/vazkii/botania/common/lib/LibItemNames.java index 5248447c1..3389be4d2 100644 --- a/MODSRC/vazkii/botania/common/lib/LibItemNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibItemNames.java @@ -27,6 +27,7 @@ public final class LibItemNames { public static final String SIGNAL_FLARE = LibResources.PREFIX_MOD + "signalFlare"; public static final String MANA_TABLET = LibResources.PREFIX_MOD + "manaTablet"; public static final String MANA_GUN = LibResources.PREFIX_MOD + "manaGun"; + public static final String MANA_COOKIE = LibResources.PREFIX_MOD + "manaCookie"; 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 5fe54e1c1..5659d1c0b 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -249,6 +249,7 @@ item.botania:signalFlare.name=Signal Flare item.botania:manaTablet.name=Mana Tablet item.botania:manaGun.name=Mana Blaster item.botania:compositeLens.name=Composite Mana Lens: %s %s +item.botania:manaCookie.name=Mana Cookie # GUI TEXT botania.gui.lexicon.header=Lexica Botania Index - Pick which category you would like to study: @@ -350,6 +351,7 @@ botania.page.pool3=Infusing &1Manasteel&0 botania.page.pool4=Infusing &1Mana Pearls&0 botania.page.pool5=Infusing &1Mana Diamonds&0 botania.page.pool6=Infusing &1Mana Petals&0 +botania.page.pool7=&1Mana Cookies&0 feed you pretty well. # -- MANA DISTRIBUTOR botania.entry.distributor=Mana Distributor diff --git a/resources/assets/botania/textures/items/manaCookie.png b/resources/assets/botania/textures/items/manaCookie.png new file mode 100644 index 000000000..bf77c3aeb Binary files /dev/null and b/resources/assets/botania/textures/items/manaCookie.png differ