diff --git a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java index c0a8e9703..4512dfa64 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java @@ -106,6 +106,7 @@ public final class ModCrafingRecipes { public static IRecipe recipeKnocbackBelt; public static IRecipe recipeIcePendant; public static IRecipe recipeLavaPendant; + public static IRecipe recipeLifeEssence; public static void init() { // Lexicon Recipe @@ -538,6 +539,10 @@ public final class ModCrafingRecipes { 'M', LibOreDict.RUNE[5], 'F', LibOreDict.RUNE[1]); recipeLavaPendant = BotaniaAPI.getLatestAddedRecipe(); + + // Essence of Eternal Life Recipe + addShapelessOreDictRecipe(new ItemStack(ModItems.manaResource, 12, 5), LibOreDict.TERRA_STEEL, new ItemStack(Items.nether_star), new ItemStack(Items.blaze_powder)); + recipeLifeEssence = BotaniaAPI.getLatestAddedRecipe(); } private static void addOreDictRecipe(ItemStack output, Object... recipe) { diff --git a/MODSRC/vazkii/botania/common/item/ItemManaResource.java b/MODSRC/vazkii/botania/common/item/ItemManaResource.java index d5b17dd80..128cdb831 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 = 5; + final int types = 6; IIcon[] icons; public ItemManaResource() { diff --git a/MODSRC/vazkii/botania/common/item/ModItems.java b/MODSRC/vazkii/botania/common/item/ModItems.java index a71d8c871..c49929d30 100644 --- a/MODSRC/vazkii/botania/common/item/ModItems.java +++ b/MODSRC/vazkii/botania/common/item/ModItems.java @@ -142,6 +142,7 @@ public final class ModItems { OreDictionary.registerOre(LibOreDict.MANA_DIAMOND, new ItemStack(manaResource, 1, 2)); 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)); // 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 3d05888ef..57f00f5cc 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -153,7 +153,7 @@ public final class LexiconData { new PageRuneRecipe("13", ModRuneRecipes.recipeLustRune), new PageRuneRecipe("14", ModRuneRecipes.recipeGluttonyRune), new PageRuneRecipe("15", ModRuneRecipes.recipeGreedRune), new PageRuneRecipe("16", ModRuneRecipes.recipeSlothRune), new PageRuneRecipe("17", ModRuneRecipes.recipeWrathRune), new PageRuneRecipe("18", ModRuneRecipes.recipeEnvyRune), new PageRuneRecipe("19", ModRuneRecipes.recipePrideRune)); terrasteel = new BLexiconEntry(LibLexicon.BASICS_TERRASTEEL, categoryBasics); - terrasteel.setLexiconPages(new PageText("0"), new PageTerrasteel("1")); + terrasteel.setLexiconPages(new PageText("0"), new PageTerrasteel("1"), new PageText("2"), new PageCraftingRecipe("3", ModCrafingRecipes.recipeLifeEssence)); // MANA ENTRIES manaIntro = new BLexiconEntry(LibLexicon.MANA_INTRO, categoryMana); diff --git a/MODSRC/vazkii/botania/common/lib/LibItemNames.java b/MODSRC/vazkii/botania/common/lib/LibItemNames.java index e1aff1751..2ebe5a1ba 100644 --- a/MODSRC/vazkii/botania/common/lib/LibItemNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibItemNames.java @@ -78,6 +78,7 @@ public final class LibItemNames { LibResources.PREFIX_MOD + "manaPearl", LibResources.PREFIX_MOD + "manaDiamond", LibResources.PREFIX_MOD + "livingwoodTwig", - LibResources.PREFIX_MOD + "terrasteel" + LibResources.PREFIX_MOD + "terrasteel", + LibResources.PREFIX_MOD + "lifeEssence" }; } diff --git a/MODSRC/vazkii/botania/common/lib/LibOreDict.java b/MODSRC/vazkii/botania/common/lib/LibOreDict.java index 5e4bb02ba..b07fe4f61 100644 --- a/MODSRC/vazkii/botania/common/lib/LibOreDict.java +++ b/MODSRC/vazkii/botania/common/lib/LibOreDict.java @@ -23,6 +23,7 @@ public final class LibOreDict { public static final String MANA_DIAMOND = "manaDiamond"; 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[] 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 f8987525c..5e8e1bd82 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -297,6 +297,7 @@ item.botania:travelBelt.name=Soujourner's Sash item.botania:knockbackBelt.name=Tectonic Girdle item.botania:icePendant.name=Snowflake Pendant item.botania:lavaPendant.name=Pyroclast Pendant +item.botania:lifeEssence.name=Essence of Eternal Life # GUI TEXT botania.gui.lexicon.header=Lexica Botania Index - Pick which category you would like to study: @@ -377,7 +378,9 @@ botania.page.runeAltar19=The &1Rune of Pride&0. # -- TERRASTEEL botania.entry.terrasteel=Terrasteel botania.page.terrasteel0=&1Terrasteel&0 is a powerful metal infused with the magic of nature.
Creating this metal proves to not be a short order, in order to create it, toss a &1Manasteel Ingot&0, a &1Mana Pearl&0 and a &1Mana Diamond&0 on top of an &4Active &1Beacon&0. A &1Mana Pool&0 must be present nearby, being at least half full. The infusion will create a single &1Terrasteel Ingot&0. -botania.page.terrasteel1=Creating Terrasteel +botania.page.terrasteel1=Creating &1Terrasteel&0 +botania.page.terrasteel2=By combining the &1Terrasteel&0 with a &1Nether Star&0 and &1Blaze Powder&0, it's possible to artificially create a small extract of &1Essence of Eternal Life&0, a very powerful component in the creation of magical flora and natural instruments. +botania.page.terrasteel3=An extract of &1Essence of Eternal Life&0 # - MANA # -- AN INTRODUCTION TO MANA diff --git a/resources/assets/botania/textures/items/lifeEssence.png b/resources/assets/botania/textures/items/lifeEssence.png new file mode 100644 index 000000000..a9a9a3be2 Binary files /dev/null and b/resources/assets/botania/textures/items/lifeEssence.png differ