From baefda2890d85e995f1bc6f07cb06be524f7b81d Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Fri, 26 Sep 2014 21:52:23 +0100 Subject: [PATCH] TC interaction docs. --- .../botania/common/crafting/ModCrafingRecipes.java | 2 ++ .../common/crafting/ModManaInfusionRecipes.java | 10 +++++++++- MODSRC/vazkii/botania/common/lexicon/LexiconData.java | 6 ++++++ MODSRC/vazkii/botania/common/lib/LibLexicon.java | 1 + resources/assets/botania/lang/en_US.lang | 11 ++++++++++- 5 files changed, 28 insertions(+), 2 deletions(-) diff --git a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java index 668ad6f84..5aedd5060 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java @@ -196,6 +196,7 @@ public final class ModCrafingRecipes { public static IRecipe recipeGravityRod; public static IRecipe recipeRegenIvy; public static IRecipe recipeUltraSpreader; + public static IRecipe recipeHelmetOfRevealing; public static void init() { // Lexicon Recipe @@ -1258,6 +1259,7 @@ public final class ModCrafingRecipes { if(Botania.thaumcraftLoaded) { Item goggles = (Item) Item.itemRegistry.getObject("Thaumcraft:ItemGoggles"); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.manasteelHelmRevealing), new ItemStack(ModItems.manasteelHelm), new ItemStack(goggles)); + recipeHelmetOfRevealing = BotaniaAPI.getLatestAddedRecipe(); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.terrasteelHelmRevealing), new ItemStack(ModItems.terrasteelHelm), new ItemStack(goggles)); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.elementiumHelmRevealing), new ItemStack(ModItems.elementiumHelm), new ItemStack(goggles)); } diff --git a/MODSRC/vazkii/botania/common/crafting/ModManaInfusionRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModManaInfusionRecipes.java index 89bda2c0a..3e7c5f25d 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModManaInfusionRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModManaInfusionRecipes.java @@ -16,9 +16,11 @@ import java.util.List; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipeManaInfusion; +import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibOreDict; @@ -38,6 +40,7 @@ public final class ModManaInfusionRecipes { public static List mycelSeedsRecipes; public static RecipeManaInfusion manaQuartzRecipe; public static RecipeManaInfusion tinyPotatoRecipe; + public static RecipeManaInfusion manaInkwellRecipe; public static void init() { poolRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.pool), new ItemStack(ModBlocks.pool, 1, 2), 320); @@ -63,7 +66,12 @@ public final class ModManaInfusionRecipes { manaQuartzRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.quartz, 1, 1), new ItemStack(Items.quartz), 250); tinyPotatoRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.tinyPotato), new ItemStack(Items.potato), 1337); - + + if(Botania.thaumcraftLoaded) { + Item inkwell = (Item) Item.itemRegistry.getObject("Thaumcraft:ItemInkwell"); + manaInkwellRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaInkwell), new ItemStack(inkwell), 35000); + } + BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaBottle), new ItemStack(Items.glass_bottle), 5000); } diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index 0ebdf3af4..8599dcd0f 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -188,6 +188,7 @@ public final class LexiconData { public static LexiconEntry headCreating; public static LexiconEntry azulejo; public static LexiconEntry starfield; + public static LexiconEntry tcIntegration; public static void init() { BotaniaAPI.addCategory(categoryBasics = new LexiconCategory(LibLexicon.CATEGORY_BASICS)); @@ -640,6 +641,11 @@ public final class LexiconData { starfield = new ALexiconEntry(LibLexicon.MISC_STARFIELD, categoryMisc); starfield.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeStarfield)); + + if(Botania.thaumcraftLoaded) { + tcIntegration = new BLexiconEntry(LibLexicon.MISC_TC_INTEGRATION, categoryMisc); + tcIntegration.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCrafingRecipes.recipeHelmetOfRevealing), new PageText("3"), new PageManaInfusionRecipe("4", ModManaInfusionRecipes.manaInkwellRecipe), new PageText("5")); + } } public static void postInit() { diff --git a/MODSRC/vazkii/botania/common/lib/LibLexicon.java b/MODSRC/vazkii/botania/common/lib/LibLexicon.java index f85e10b5e..6db751d8e 100644 --- a/MODSRC/vazkii/botania/common/lib/LibLexicon.java +++ b/MODSRC/vazkii/botania/common/lib/LibLexicon.java @@ -162,5 +162,6 @@ public final class LibLexicon { public static final String MISC_HEAD_CREATING = "headCreating"; public static final String MISC_AZULEJO = "azulejo"; public static final String MISC_STARFIELD = "starfield"; + public static final String MISC_TC_INTEGRATION = "tcIntegration"; } diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index b447cddd2..c4d9c9443 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -810,7 +810,7 @@ botania.page.terrasteel1=Creating &1Terrasteel&0 # -- WRAP botania.entry.wrap=Wrap -botania.page.wrap0=It seems like the creator of this mod decided to add a weird game mechanic in the form of &1Wrap&0. I don't really know what it does, probably something bad. :/
What's that "Fourth Wall" you're talking about...? +botania.page.wrap0=It seems like the creator of this mod decided to add a weird game mechanic in the form of &1Wrap&0. I don't really know what it does, probably something bad. :/
What's this "Fourth Wall" you're talking about...? # - MANA # -- AN INTRODUCTION TO MANA @@ -1665,3 +1665,12 @@ botania.page.azulejo3=Cycling between the patterns botania.entry.starfield=Starfield Creator botania.page.starfield0=The &1Starfield Creator&0 does exactly as it says, by releasing elven energies into the air, if it's placed in the world, during night time it will create a starry sky that extends for a fair distance. botania.page.starfield1=Twinkle twinkle + +# -- THAUMCRAFT INTEGRATION +botania.entry.tcIntegration=Thaumcraft Integration +botania.page.tcIntegration0=Often enough, the paths of &4Botany&0 and &4Thaumaturgy&0 cross together. Mixing some of the artifacts mentioned in this book as well as any from the school of &5Thaumcraft&0 can allow for combinations of these to form. +botania.page.tcIntegration1=First and foremost, combining any of the &1Mana Metal&0 helms with a set of &1Goggles of Revealing&0 allows for a combination of both.
The protection and regenerability of the armor works alongside the Goggles' abilities, but the &4Vis&0 discount is loss. +botania.page.tcIntegration2=Helmets of Revealing (works with any Botania helm) +botania.page.tcIntegration3=Carrying on, &4Mana&0 can also serve as an interesting type of Ink. Infusing a set of black &1Scribing Tools&0 with &4Mana&0 from a &1Mana Pool&0 allows for them to use said &4Mana&0 as their source of color.
Refilling these tools works similarly to a &1Mana Tablet&0, done by tossing it on top of the pool. +botania.page.tcIntegration4=Making the &1Botanurgist's Inkwell +botania.page.tcIntegration5=Last but not least, there's a few varied resources or constructs that can work as paraphernalia for an &1Infusion Altar&0, to lower its' instability.
These come in the form of &1Glimmering Flowers, Floating Flowers and any variety of Pylons&0. \ No newline at end of file