From 78f55319ddde3b52dcfbd464aa662b5f6a303a8a Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Thu, 15 May 2014 17:15:44 +0100 Subject: [PATCH] Added the Redstone Root. --- .../common/crafting/ModCrafingRecipes.java | 5 +++++ .../botania/common/item/ItemManaResource.java | 16 ++++++++++++++-- MODSRC/vazkii/botania/common/item/ModItems.java | 1 + .../botania/common/lexicon/LexiconData.java | 2 +- .../vazkii/botania/common/lib/LibItemNames.java | 3 ++- .../vazkii/botania/common/lib/LibOreDict.java | 1 + resources/assets/botania/lang/en_US.lang | 3 +++ .../botania/textures/items/redstoneRoot.png | Bin 0 -> 3103 bytes 8 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 resources/assets/botania/textures/items/redstoneRoot.png diff --git a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java index 7dd0a9efa..314fca8eb 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java @@ -110,6 +110,7 @@ public final class ModCrafingRecipes { public static IRecipe recipeAlchemyCatalyst; public static IRecipe recipeOpenCrate; public static IRecipe recipeForestEye; + public static IRecipe recipeRedstoneRoot; public static void init() { // Lexicon Recipe @@ -585,6 +586,10 @@ public final class ModCrafingRecipes { 'E', new ItemStack(Items.ender_eye)); recipeForestEye = BotaniaAPI.getLatestAddedRecipe(); + // Redstone Root Recipe + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.manaResource, 1, 6), new ItemStack(Items.redstone), new ItemStack(Blocks.tallgrass, 1, 1)); + recipeRedstoneRoot = BotaniaAPI.getLatestAddedRecipe(); + // Mana and Terrasteel Block Recipes addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0), "III", "III", "III", diff --git a/MODSRC/vazkii/botania/common/item/ItemManaResource.java b/MODSRC/vazkii/botania/common/item/ItemManaResource.java index 128cdb831..1f03c7a15 100644 --- a/MODSRC/vazkii/botania/common/item/ItemManaResource.java +++ b/MODSRC/vazkii/botania/common/item/ItemManaResource.java @@ -15,15 +15,17 @@ import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import vazkii.botania.api.recipe.IFlowerComponent; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; -public class ItemManaResource extends ItemMod { +public class ItemManaResource extends ItemMod implements IFlowerComponent { - final int types = 6; + final int types = 7; IIcon[] icons; public ItemManaResource() { @@ -54,4 +56,14 @@ public class ItemManaResource extends ItemMod { public IIcon getIconFromDamage(int par1) { return icons[Math.min(icons.length - 1, par1)]; } + + @Override + public boolean canFit(ItemStack stack, IInventory apothecary) { + return stack.getItemDamage() == 6; + } + + @Override + public int getParticleColor(ItemStack stack) { + return 0x9b0000; + } } diff --git a/MODSRC/vazkii/botania/common/item/ModItems.java b/MODSRC/vazkii/botania/common/item/ModItems.java index 1f63c0b9d..79a4f5a42 100644 --- a/MODSRC/vazkii/botania/common/item/ModItems.java +++ b/MODSRC/vazkii/botania/common/item/ModItems.java @@ -146,6 +146,7 @@ public final class ModItems { OreDictionary.registerOre(LibOreDict.LIVINGWOOD_TWIG, new ItemStack(manaResource, 1, 3)); OreDictionary.registerOre(LibOreDict.TERRA_STEEL, new ItemStack(manaResource, 1, 4)); OreDictionary.registerOre(LibOreDict.LIFE_ESSENCE, new ItemStack(manaResource, 1, 5)); + OreDictionary.registerOre(LibOreDict.REDSTONE_ROOT, new ItemStack(manaResource, 1, 6)); // Vanilla ores (because forge doesn't do this by default for some reason) OreDictionary.registerOre("ingotIron", Items.iron_ingot); diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index 95b613e0e..ba13e056c 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -227,7 +227,7 @@ public final class LexiconData { // FUNCTIONAL FLOWERS ENTRIES functionalIntro = new BLexiconEntry(LibLexicon.FFLOWER_INTRO, categoryFunctionalFlowers); - functionalIntro.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2")); + functionalIntro.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3"), new PageCraftingRecipe("4", ModCrafingRecipes.recipeRedstoneRoot)); jadedAmaranthus = new BLexiconEntry(LibLexicon.FFLOWER_JADED_AMARANTHUS, categoryFunctionalFlowers); jadedAmaranthus.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.jadedAmaranthusRecipe)); diff --git a/MODSRC/vazkii/botania/common/lib/LibItemNames.java b/MODSRC/vazkii/botania/common/lib/LibItemNames.java index e87036d29..984dc9ab9 100644 --- a/MODSRC/vazkii/botania/common/lib/LibItemNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibItemNames.java @@ -80,6 +80,7 @@ public final class LibItemNames { LibResources.PREFIX_MOD + "manaDiamond", LibResources.PREFIX_MOD + "livingwoodTwig", LibResources.PREFIX_MOD + "terrasteel", - LibResources.PREFIX_MOD + "lifeEssence" + LibResources.PREFIX_MOD + "lifeEssence", + LibResources.PREFIX_MOD + "redstoneRoot" }; } diff --git a/MODSRC/vazkii/botania/common/lib/LibOreDict.java b/MODSRC/vazkii/botania/common/lib/LibOreDict.java index b07fe4f61..738918112 100644 --- a/MODSRC/vazkii/botania/common/lib/LibOreDict.java +++ b/MODSRC/vazkii/botania/common/lib/LibOreDict.java @@ -24,6 +24,7 @@ public final class LibOreDict { public static final String LIVINGWOOD_TWIG = "livingwoodTwig"; public static final String TERRA_STEEL = "ingotTerrasteel"; public static final String LIFE_ESSENCE = "eternalLifeEssence"; + public static final String REDSTONE_ROOT = "redstoneRoot"; public static final String[] FLOWER = new String[] { "mysticFlowerWhite", "mysticFlowerOrange", "mysticFlowerMagenta", "mysticFlowerLightBlue", "mysticFlowerYellow", "mysticFlowerLime", "mysticFlowerPink", "mysticFlowerGray", "mysticFlowerLightGray", "mysticFlowerCyan", "mysticFlowerPurple", "mysticFlowerBlue", "mysticFlowerBrown", "mysticFlowerGreen", "mysticFlowerRed", "mysticFlowerBlack", diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index b77279c94..4ec0bbce7 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -315,6 +315,7 @@ item.botania:icePendant.name=Snowflake Pendant item.botania:lavaPendant.name=Pyroclast Pendant item.botania:lifeEssence.name=Essence of Eternal Life item.botania:goldenLaurel.name=Golden Laurel Crown +item.botania:redstoneRoot.name=Redstone Root # GUI TEXT botania.gui.lexicon.header=Lexica Botania Index - Pick which category you would like to study: @@ -523,6 +524,8 @@ botania.entry.fIntro=An Introduction to Function botania.page.fIntro0=There are various places in which the &4Mana&0 a botanist generates can be put to use, one of them is an assortment of &4Functional Flowers&0.
These flowers will drain &4Mana&0 from a nearby &1Mana Pool&0 into themselves, in order to do whatever task they were created for.
It's to note that these can't receive power directly through &1Mana Spreaders&0. botania.page.fIntro1=All &4Functional Flowers&0, alike the &4Generating Flowers&0 contain a small buffer of &4Mana&0.
Standard rules for &4Mana&0 reading apply, right clicking with a &1Wand of the Forest&0 will update the mana readings. botania.page.fIntro2=It is important to keep in mind that these flowers memorize the &1Mana Pool&0 from which they should pull &4Mana&0 out of. They'll only pull from the nearest pool present at the time of the flower being placed (or the closest placed afterward, if none was present), and none other, unless that one is removed. +botania.page.fIntro3=Lastly, some functional flowers utilize a &1Redstone Root&0 in their creation. If they do, the flower's effect can be toggled with a redstone signal. +botania.page.fIntro4=&1Redstone Root&0 for Redstone Control # -- JADED AMARANTHUS botania.entry.jadedAmaranthus=Jaded Amaranthus diff --git a/resources/assets/botania/textures/items/redstoneRoot.png b/resources/assets/botania/textures/items/redstoneRoot.png new file mode 100644 index 0000000000000000000000000000000000000000..93f57afcaaa92b0c8715472791770d8145180067 GIT binary patch literal 3103 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 literal 0 HcmV?d00001