From 8e26e00393db0d354606500e5d7535f0d823af11 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Mon, 29 Jun 2015 18:40:02 +0100 Subject: [PATCH] Added a challenge entry and make some of the entries in the misc section priority. --- .../vazkii/botania/client/gui/lexicon/GuiLexicon.java | 1 + .../java/vazkii/botania/common/lexicon/LexiconData.java | 8 ++++++-- src/main/java/vazkii/botania/common/lib/LibLexicon.java | 1 + src/main/resources/assets/botania/lang/en_US.lang | 6 ++++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java index 83f25f6e4..710102e4c 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -404,6 +404,7 @@ public class GuiLexicon extends GuiScreen { tutorial.add(LexiconData.dispenserTweaks); if(SheddingHandler.hasShedding()) tutorial.add(LexiconData.shedding); + tutorial.add(LexiconData.challenges); } public final void putTutorialArrow() { diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 42f5384ca..8be0f0883 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -255,6 +255,7 @@ public final class LexiconData { public static LexiconEntry phantomInk; public static LexiconEntry stoneAlchemy; public static LexiconEntry blazeBlock; + public static LexiconEntry challenges; public static LexiconEntry tcIntegration; public static LexiconEntry bcIntegration; @@ -893,7 +894,7 @@ public final class LexiconData { new PageText("16"), new PageCraftingRecipe("17", ModCraftingRecipes.recipeReedBlock), new PageCraftingRecipe("18", ModCraftingRecipes.recipeThatch), new PageCraftingRecipe("19", ModCraftingRecipes.recipeRoofTile), new PageCraftingRecipe("20", ModCraftingRecipes.recipeNetherBrick), new PageCraftingRecipe("21", ModCraftingRecipes.recipeSoulBrick), new PageCraftingRecipe("22", ModCraftingRecipes.recipeSnowBrick)); dispenserTweaks = new BLexiconEntry(LibLexicon.MISC_DISPENSER_TWEAKS, categoryMisc); - dispenserTweaks.setLexiconPages(new PageText("0")).setIcon(new ItemStack(Blocks.dispenser)); + dispenserTweaks.setLexiconPages(new PageText("0")).setPriority().setIcon(new ItemStack(Blocks.dispenser)); shinyFlowers = new BLexiconEntry(LibLexicon.MISC_SHINY_FLOWERS, categoryMisc); shinyFlowers.setLexiconPages(new PageText("0"), new PageText("3"), new PageCraftingRecipe("1", ModCraftingRecipes.recipesShinyFlowers), new PageCraftingRecipe("2", ModCraftingRecipes.recipesMiniIsland)); @@ -931,6 +932,9 @@ public final class LexiconData { blazeBlock.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeBlazeBlock)); LexiconRecipeMappings.map(new ItemStack(Blocks.obsidian), blazeBlock, 0); + challenges = new BLexiconEntry(LibLexicon.MISC_CHALLENGES, categoryMisc); + challenges.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2")).setPriority().setIcon(new ItemStack(ModItems.cosmetic, 1, 31)); + if(Botania.bcTriggersLoaded) { bcIntegration = new CLexiconEntry(LibLexicon.MISC_BC_INTEGRATION, categoryMisc, "BuildCraft"); bcIntegration.setLexiconPages(new PageText("0")).setIcon(new ItemStack(Items.redstone)); @@ -940,7 +944,7 @@ public final class LexiconData { public static void postInit() { if(SheddingHandler.hasShedding()) { shedding = new BLexiconEntry(LibLexicon.MISC_SHEDDING, BotaniaAPI.categoryMisc); - shedding.setLexiconPages(new PageText("0")).setIcon(new ItemStack(Items.feather)); + shedding.setLexiconPages(new PageText("0")).setPriority().setIcon(new ItemStack(Items.feather)); SheddingHandler.addToLexicon(); } diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index 9692e36c5..e4638654e 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -225,6 +225,7 @@ public final class LibLexicon { public static final String MISC_PHANTOM_INK = "phantomInk"; public static final String MISC_STONE_ALCHEMY = "stoneAlchemy"; public static final String MISC_BLAZE_BLOCK = "blazeBlock"; + public static final String MISC_CHALLENGES = "challenges"; public static final String MISC_TC_INTEGRATION = "tcIntegration"; public static final String MISC_BC_INTEGRATION = "bcIntegration"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index d6c9e8c77..359bd8155 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -2851,6 +2851,12 @@ botania.entry.blazeBlock=Blaze Light botania.page.blazeBlock0=Smashing a bunch of &1Blaze Rods&0 together makes a usable decorative light block. A crude one, admittedly, but a source of light non the less.
Naturally, like a &1Block of Coal&0, the &1Blaze Light&0 can also be used to fuel furnaces and other fuel consumers alike. Putting it next to a &1Pure Daisy&0 converts it into &1Obsidian&0, strangely enough. botania.page.blazeBlock1=0x1a4 +# -- CHALLENGES +botania.entry.challenges=Challenges +botania.page.challenges0=&1Challenges&0 are available in the &1Lexica Botania&0 by clicking the icon in the right of the landing page shaped like a cup. These, as the name says, challenge the player to create a mechanism using the features only available in &1Botania&0 and &1Minecraft&0 itself.
Of course, you can use items from other mods to complete them, but that's no fun. +botania.page.challenges1=All of the challenges are possible, of course. They just require some thinking and knowledge of the ins and outs of redstone and the &1Botania&0 mechanics themselves.
It's highly recommended that they're done without using features from external mods, as they have been created with that in mind, and aren't really challenges if you put down a block that solves them instantly. +botania.page.challenges2=The challenges aren't obligatory in any way, and do not provide any material reward. They're purely suggestions as to what &1Botania&0 can do, automation wise, and are but scratching the surface of that topic. Challenges need be marked completed manually.
It should be kept in mind that the boundaries of this world are one's imagination, so don't stop at the ideas in there! + # -- 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.