From 289a48d3fbc2920724a9155e11f1043ee2bd7e0c Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Mon, 20 Jul 2015 23:14:15 +0100 Subject: [PATCH] Cacophonium recipe/docs. --- .../common/crafting/ModCraftingRecipes.java | 14 ++++++++++++++ .../vazkii/botania/common/lexicon/LexiconData.java | 4 ++++ .../java/vazkii/botania/common/lib/LibLexicon.java | 1 + src/main/resources/assets/botania/lang/en_US.lang | 5 +++++ 4 files changed, 24 insertions(+) diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 02626a7da..67a16445b 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -21,6 +21,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; +import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; import vazkii.botania.api.BotaniaAPI; @@ -271,6 +272,7 @@ public final class ModCraftingRecipes { public static IRecipe recipeDetectorLuminizer; public static IRecipe recipeLuminizerLauncher; public static IRecipe recipeObedienceStick; + public static IRecipe recipeCacophonium; // Garden of Glass public static IRecipe recipeRootToSapling; @@ -1836,6 +1838,18 @@ public final class ModCraftingRecipes { 'T', LibOreDict.LIVINGWOOD_TWIG); recipeObedienceStick = BotaniaAPI.getLatestAddedRecipe(); + // Cacophonium Recipe + if(OreDictionary.getOres("ingotBrass").isEmpty()) + addOreDictRecipe(new ItemStack(ModItems.cacophonium), + " G ", "GNG", "GG ", + 'G', "ingotGold", + 'N', new ItemStack(Blocks.noteblock)); + else addOreDictRecipe(new ItemStack(ModItems.cacophonium), + " G ", "GNG", "GG ", + 'G', "ingotBrass", + 'N', new ItemStack(Blocks.noteblock)); + recipeCacophonium = BotaniaAPI.getLatestAddedRecipe(); + // Storage Block/Nugget Recipes addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0), "III", "III", "III", diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index ea35c1ac3..b5efcad60 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -260,6 +260,7 @@ public final class LexiconData { public static LexiconEntry stoneAlchemy; public static LexiconEntry blazeBlock; public static LexiconEntry challenges; + public static LexiconEntry cacophonium; public static LexiconEntry tcIntegration; public static LexiconEntry bcIntegration; @@ -956,6 +957,9 @@ public final class LexiconData { 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)); + cacophonium = new BLexiconEntry(LibLexicon.MISC_CACOPHONIUM, categoryMisc); + cacophonium.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeCacophonium)); + if(Botania.bcTriggersLoaded) { bcIntegration = new CLexiconEntry(LibLexicon.MISC_BC_INTEGRATION, categoryMisc, "BuildCraft"); bcIntegration.setLexiconPages(new PageText("0")).setIcon(new ItemStack(Items.redstone)); diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index 77041ef8d..ed66affb4 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -230,6 +230,7 @@ public final class LibLexicon { 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_CACOPHONIUM = "cacophonium"; 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 51f917ebe..a5180d8b9 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -2933,6 +2933,11 @@ botania.page.challenges0=&1Challenges&0 are available in the &1Lexica Botania&0 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! +# -- CACOPHONIUM +botania.entry.cacophonium=Cacophonium +botania.page.cacophonium0=This interesting instrument, the &1Cacophonium&0, has the ability to mimic almost every living being's cries in nature, allowing for the "musician" to play them at will. Right clicking with it on an entity has the instrument learn its sound. It can then be played by holding right click.
Why anyone would ever want to make this, however, is beyond moral comprehension. +botania.page.cacophonium1=Hibike! Cacophonium + # -- 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.