diff --git a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java index d9e86234b..0a470e7f3 100644 --- a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -88,6 +88,8 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.terrasteelLegs); addItem(ModItems.terrasteelBoots); + addItem(ModItems.tinyPlanet); + addItem(ModItems.manaTablet); addItem(ModItems.manaMirror); addBlock(ModBlocks.pool); diff --git a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java index bfc4fb511..6a3532abe 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java @@ -97,6 +97,7 @@ public final class ModCrafingRecipes { public static IRecipe recipeTerrasteelLegs; public static IRecipe recipeTerrasteelBoots; public static IRecipe recipeTerraSword; + public static IRecipe recipeTinyPlanet; public static void init() { // Lexicon Recipe @@ -457,6 +458,14 @@ public final class ModCrafingRecipes { 'I', LibOreDict.TERRA_STEEL, 'S', LibOreDict.LIVINGWOOD_TWIG); recipeTerraSword = BotaniaAPI.getLatestAddedRecipe(); + + // Tiny Planet Recipe + addOreDictRecipe(new ItemStack(ModItems.tinyPlanet), + "LSL", "SPS", "LSL", + 'S', "stone", + 'L', LibOreDict.LIVING_ROCK, + 'P', LibOreDict.MANA_PEARL); + recipeTinyPlanet = BotaniaAPI.getLatestAddedRecipe(); } private static void addOreDictRecipe(ItemStack output, Object... recipe) { diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index 75931fd6a..bdbdb00ed 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -39,6 +39,7 @@ public final class LexiconData { public static LexiconCategory categoryGenerationFlowers; public static LexiconCategory categoryDevices; public static LexiconCategory categoryTools; + public static LexiconCategory categoryBaubles; public static LexiconCategory categoryMisc; public static LexiconEntry flowers; @@ -105,6 +106,8 @@ public final class LexiconData { public static LexiconEntry grassHorn; public static LexiconEntry terraBlade; + public static LexiconEntry tinyPlanet; + public static LexiconEntry unstableBlocks; public static LexiconEntry decorativeBlocks; @@ -115,6 +118,7 @@ public final class LexiconData { BotaniaAPI.addCategory(categoryGenerationFlowers = new LexiconCategory(LibLexicon.CATEGORY_GENERATION_FLOWERS)); BotaniaAPI.addCategory(categoryDevices = new LexiconCategory(LibLexicon.CATEGORY_DEVICES)); BotaniaAPI.addCategory(categoryTools = new LexiconCategory(LibLexicon.CATEGORY_TOOLS)); + BotaniaAPI.addCategory(categoryBaubles = new LexiconCategory(LibLexicon.CATEGORY_BAUBLES)); BotaniaAPI.addCategory(categoryMisc = new LexiconCategory(LibLexicon.CATEGORY_MISC)); // BASICS ENTRIES @@ -307,6 +311,10 @@ public final class LexiconData { terraBlade = new BLexiconEntry(LibLexicon.TOOL_TERRA_SWORD, categoryTools); terraBlade.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeTerraSword)); + // BAUBLES ENTRIES + tinyPlanet = new BLexiconEntry(LibLexicon.BAUBLE_TINY_PLANET, categoryBaubles); + tinyPlanet.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeTinyPlanet)); + // MISCLENAEOUS ENTRIES unstableBlocks = new BLexiconEntry(LibLexicon.MISC_UNSTABLE_BLOCKS, categoryMisc); unstableBlocks.setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_UNSTABLE_BLOCK), new PageCraftingRecipe("2", ModCrafingRecipes.recipesUnstableBlocks), new PageText("3"), new PageImage("4", LibResources.ENTRY_UNSTABLE_BEACON), new PageCraftingRecipe("5", ModCrafingRecipes.recipesManaBeacons), new PageText("6"), new PageCraftingRecipe("7", ModCrafingRecipes.recipesSignalFlares)); diff --git a/MODSRC/vazkii/botania/common/lib/LibLexicon.java b/MODSRC/vazkii/botania/common/lib/LibLexicon.java index d40f44784..59709c5f8 100644 --- a/MODSRC/vazkii/botania/common/lib/LibLexicon.java +++ b/MODSRC/vazkii/botania/common/lib/LibLexicon.java @@ -21,6 +21,7 @@ public final class LibLexicon { public static final String CATEGORY_GENERATION_FLOWERS = CATEGORY_PREFIX + "generationFlowers"; public static final String CATEGORY_DEVICES = CATEGORY_PREFIX + "devices"; public static final String CATEGORY_TOOLS = CATEGORY_PREFIX + "tools"; + public static final String CATEGORY_BAUBLES = CATEGORY_PREFIX + "baubles"; public static final String CATEGORY_MISC = CATEGORY_PREFIX + "misc"; public static final String BASICS_FLOWERS = "flowers"; @@ -87,6 +88,8 @@ public final class LibLexicon { public static final String TOOL_GRASS_HORN = "grassHorn"; public static final String TOOL_TERRA_SWORD = "terraSword"; + public static final String BAUBLE_TINY_PLANET = "tinyPlanet"; + public static final String MISC_UNSTABLE_BLOCKS = "unstableBlocks"; public static final String MISC_DECORATIVE_BLOCKS = "decorativeBlocks"; diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index f0d9d2ce0..beb2b2d11 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -300,6 +300,7 @@ botania.category.functionalFlowers=Functional Flora botania.category.generationFlowers=Generating Flora botania.category.devices=Natural Apparatus botania.category.tools=Mystical Instruments +botania.category.baubles=Baubles and Acessories botania.category.misc=Miscellaneous # LEXICON ENTRIES @@ -678,6 +679,12 @@ botania.entry.terraSword=Terra Blade botania.page.terraSword0=The &1Terra Blade&0, crafted from &1Terrasteel Ingots&0, is a sword infused with natural strength. Not only does it par with a &1Diamond Sword&0 in terms of strength and it uses &4Mana&0 from the inventory like &1Manasteel Tools&0, but when it's swinged, there's a chance for it to create a beam that will deal as much damage as a melee hit. botania.page.terraSword1=No Broken Hero Sword +# - BAUBLES +# -- TINY PLANET +botania.entry.tinyPlanet=Tiny Planet +botania.page.tinyPlanet0=The &1Tiny Planet&0 is a bauble with gravitational proprieties, while equipped, the &1Tiny Planet&0 will pull any nearby &4Mana Bursts&0 towards the wearer, having them orbit around him or her. +botania.page.tinyPlanet1=Clearly from rebirth + # - MISCLANEOUS # -- UNSTABLE CUBE botania.entry.unstableBlocks=Unstable Cubes