From fcdf5bd5b320bf3cc4579f45c19c69670f51d7dc Mon Sep 17 00:00:00 2001 From: MysteriousAges Date: Fri, 3 Jul 2015 13:34:12 -0700 Subject: [PATCH] Adding new entries for Botania pages that were previously piggybacked on existing entries. Closes #74 --- .../botania/BotaniaAPIDistanceHelper.java | 19 +++++++++++++------ .../assets/magicbees/lang/en_US.lang | 3 +++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/main/java/magicbees/main/utils/compat/botania/BotaniaAPIDistanceHelper.java b/src/main/java/magicbees/main/utils/compat/botania/BotaniaAPIDistanceHelper.java index 879e224..6bbb75a 100644 --- a/src/main/java/magicbees/main/utils/compat/botania/BotaniaAPIDistanceHelper.java +++ b/src/main/java/magicbees/main/utils/compat/botania/BotaniaAPIDistanceHelper.java @@ -1,6 +1,7 @@ package magicbees.main.utils.compat.botania; import magicbees.bees.BeeSpecies; +import magicbees.main.Config; import magicbees.main.utils.compat.BotaniaHelper; import magicbees.main.utils.compat.BotaniaHelper.ManaResource; import magicbees.main.utils.compat.BotaniaHelper.Rune; @@ -18,6 +19,8 @@ import forestry.api.apiculture.EnumBeeType; */ public class BotaniaAPIDistanceHelper { + public static LexiconEntry entryManasteelForestryTools; + public static LexiconEntry entryBeeTrade; public static LexiconEntry entryBeegonia; public static LexiconEntry entryHiveacynth; public static LexiconEntry entryHibeescus; @@ -53,13 +56,17 @@ public class BotaniaAPIDistanceHelper { tradeBeeAelfheim = new SpeciesRecipeElvenTrade(BeeSpecies.BOT_DREAMING, BeeSpecies.BOT_ALFHEIM); BotaniaAPI.elvenTradeRecipes.add(tradeBeeAelfheim); - LexiconEntry manasteelEntry = getLexiconEntryForName(BotaniaHelper.LEXICON_ENTRY_MANA_GEAR); - manasteelEntry.addPage(BotaniaAPI.internalHandler.craftingRecipePage("magicbees.botania.lexicon.manasteelScoop", BotaniaHelper.manasteelScoopRecipe)); - manasteelEntry.addPage(BotaniaAPI.internalHandler.craftingRecipePage("magicbees.botania.lexicon.manasteelGrafter", BotaniaHelper.manasteelGrafterRecipe)); + entryManasteelForestryTools = new BotaniaLexiconEntry("magicbees.botania.lexicon.manasteelTools.title", BotaniaAPI.categoryTools); + entryManasteelForestryTools.setIcon(new ItemStack(Config.manasteelScoop)); + entryManasteelForestryTools.addPage(BotaniaAPI.internalHandler.textPage("magicbees.botania.lexicon.manasteelTools.0")); + entryManasteelForestryTools.addPage(BotaniaAPI.internalHandler.craftingRecipePage("magicbees.botania.lexicon.manasteelScoop", BotaniaHelper.manasteelScoopRecipe)); + entryManasteelForestryTools.addPage(BotaniaAPI.internalHandler.craftingRecipePage("magicbees.botania.lexicon.manasteelGrafter", BotaniaHelper.manasteelGrafterRecipe)); - LexiconEntry elfResourcesEntry = getLexiconEntryForName(BotaniaHelper.LEXICON_ENTRY_ELF_RESOURCES); - elfResourcesEntry.addPage(BotaniaAPI.internalHandler.textPage("magicbees.botania.lexicon.beeAlfheim.0")); - elfResourcesEntry.addPage(BotaniaAPI.internalHandler.elvenTradesPage("magicbees.botania.lexicon.beeAlfheim.trade", tradeBeeAelfheim)); + entryBeeTrade = new BotaniaLexiconEntry("magicbees.botania.lexicon.beeAlfheim.title", BotaniaAPI.categoryAlfhomancy); + entryBeeTrade.setIcon(BeeSpecies.BOT_ALFHEIM.getBeeItem(EnumBeeType.PRINCESS)); + entryBeeTrade.setKnowledgeType(BotaniaAPI.elvenKnowledge); + entryBeeTrade.addPage(BotaniaAPI.internalHandler.textPage("magicbees.botania.lexicon.beeAlfheim.0")); + entryBeeTrade.addPage(BotaniaAPI.internalHandler.elvenTradesPage("magicbees.botania.lexicon.beeAlfheim.trade", tradeBeeAelfheim)); RecipePetals beegoniaRecipe = BotaniaAPI.registerPetalRecipe(BotaniaAPI.internalHandler.getSubTileAsStack(SubTileBeegonia.NAME), new ItemStack(BotaniaHelper.itemPetal), diff --git a/src/main/resources/assets/magicbees/lang/en_US.lang b/src/main/resources/assets/magicbees/lang/en_US.lang index f594380..4e12b35 100644 --- a/src/main/resources/assets/magicbees/lang/en_US.lang +++ b/src/main/resources/assets/magicbees/lang/en_US.lang @@ -594,9 +594,12 @@ tc.research_page.MB_VisAuraProvider.1=Infusing Unusual Pollen with vis and combi #Botania Lexicon entries magicbees.botania.lexicon.subtitle=[Magic Bees] +magicbees.botania.lexicon.manasteelTools.title=Manasteel Naturalist's Tools +magicbees.botania.lexicon.manasteelTools.0=Manasteel's unusual properties lends itself well to Naturalist's tools. The &1Manasteel Scoop&0 can be used to effectively harvest hives, and the &1Manasteel Grafter&0 is a durable subsitute for the generic bronze grafters. Of course, both tools have the ability to regenerate with mana. For best results, combine the tool with Living Wood. magicbees.botania.lexicon.manasteelScoop=The &1Manasteel Scoop&0 magicbees.botania.lexicon.manasteelGrafter=The &1Manasteel Grafter&0 +magicbees.botania.lexicon.beeAlfheim.title=Alfheim Apimancy magicbees.botania.lexicon.beeAlfheim.trade=Trading for &bAlfheim Drones&0 magicbees.botania.lexicon.beeAlfheim.0=&1Elven Beekeepers&0 are anxious to discover the delights of your world's bees, and are particularly interested in the &1Dreaming Drones&0 that you can provide. In return, they will trade &bAlfheim Drones&0, the only bees that exist in Alfheim.