From ffb5bdfd01600093b4bb1496e043b682e270add0 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 11 Mar 2014 22:46:53 +0000 Subject: [PATCH] Recipe/docs for the Orechid. --- .../common/block/subtile/functional/SubtileOrechid.java | 1 - .../vazkii/botania/common/crafting/ModPetalRecipes.java | 9 +++++---- MODSRC/vazkii/botania/common/lexicon/LexiconData.java | 6 +++++- MODSRC/vazkii/botania/common/lib/LibLexicon.java | 1 + resources/assets/botania/lang/en_US.lang | 5 +++++ 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/MODSRC/vazkii/botania/common/block/subtile/functional/SubtileOrechid.java b/MODSRC/vazkii/botania/common/block/subtile/functional/SubtileOrechid.java index 58867f9e4..fc030ee2f 100644 --- a/MODSRC/vazkii/botania/common/block/subtile/functional/SubtileOrechid.java +++ b/MODSRC/vazkii/botania/common/block/subtile/functional/SubtileOrechid.java @@ -103,5 +103,4 @@ public class SubtileOrechid extends SubTileFunctional { } } - } diff --git a/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java index 03bcca064..388b1a9c0 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java @@ -27,13 +27,14 @@ public final class ModPetalRecipes { public static RecipePetals daybloomRecipe; public static RecipePetals endoflameRecipe; - + public static RecipePetals hydroangeasRecipe; + public static RecipePetals thermalilyRecipe; + public static RecipePetals jadedAmaranthusRecipe; public static RecipePetals bellethorneRecipe; public static RecipePetals heiseiDreamRecipe; public static RecipePetals tigerseyeRecipe; - public static RecipePetals hydroangeasRecipe; - public static RecipePetals thermalilyRecipe; + public static RecipePetals orechidRecipe; public static void init() { pureDaisyRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY), white, white, white, white); @@ -47,6 +48,6 @@ public final class ModPetalRecipes { bellethorneRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_BELLETHORN), redMana, redMana, cyan, cyan, red); heiseiDreamRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_HEISEI_DREAM), purpleMana, pinkMana, magentaMana, purple, pink, magenta, runeWrath); tigerseyeRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_TIGERSEYE), yellow, brownMana, orangeMana, lime, runeAutumn); - + orechidRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ORECHID), gray, grayMana, lightGray, lightGrayMana, lightBlue, yellow, green, red, runePride, runeSloth); } } diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index 359ed8f1f..78e39cdb4 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -69,7 +69,8 @@ public final class LexiconData { public static LexiconEntry bellethorne; public static LexiconEntry heiseiDream; public static LexiconEntry tigerseye; - + public static LexiconEntry orechid; + public static LexiconEntry generatingIntro; public static LexiconEntry daybloom; public static LexiconEntry endoflame; @@ -179,6 +180,9 @@ public final class LexiconData { tigerseye = new BLexiconEntry(LibLexicon.FFLOWER_TIGERSEYE, categoryFunctionalFlowers); tigerseye.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.tigerseyeRecipe)); + orechid = new BLexiconEntry(LibLexicon.FFLOWER_ORECHID, categoryFunctionalFlowers); + orechid.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.orechidRecipe)); + // GENERATING FLOWERS ENTRIES generatingIntro = new BLexiconEntry(LibLexicon.GFLOWER_INTRO, categoryGenerationFlowers); generatingIntro.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2")); diff --git a/MODSRC/vazkii/botania/common/lib/LibLexicon.java b/MODSRC/vazkii/botania/common/lib/LibLexicon.java index 82509e4f9..9098ddf7e 100644 --- a/MODSRC/vazkii/botania/common/lib/LibLexicon.java +++ b/MODSRC/vazkii/botania/common/lib/LibLexicon.java @@ -52,6 +52,7 @@ public final class LibLexicon { public static final String FFLOWER_BELLETHORNE = "bellethorne"; public static final String FFLOWER_HEISEI_DREAM = "heiseiDream"; public static final String FFLOWER_TIGERSEYE = "tigerseye"; + public static final String FFLOWER_ORECHID = "orechid"; public static final String GFLOWER_INTRO = "gIntro"; public static final String GFLOWER_DAYBLOOM = "daybloom"; diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 7e0ff0de9..ef0ac4f88 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -410,6 +410,11 @@ botania.entry.tigerseye=Tigerseye botania.page.tigerseye0=It's a known fact that &4Creepers&0 are terrified of &4cats&0.
The &1Tigerseye&0 exploits that very weakness, by emiting a feline aura, petrifying any nearby &4Creepers&0, preventing them from exploding. It also has the effect of making them run away from &4players&0. botania.page.tigerseye1=&oRisin' up to the challenge of our rivals&r. +# -- ORECHID +botania.entry.orechid=Orechid +botania.page.orechid0=While going mining is all good, a renewable means of getting ore is due. The &1Orechid&0 will use (a massive amount of) &4Mana&0 to generate &4ores&0 in nearby &1Stone&0 blocks.
The ores it generates are random, but seem to be biased towards more common ores rather than rarer ones. +botania.page.orechid1=&oLizbeth would like this flower&r. + # - GENERATING FLOWERS # -- AN INTRODUCTION TO GENERATION botania.entry.gIntro=An Introduction to Generation