From e1c0077b88ba1ddb47bf682b283e5fc1bf4f11b3 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Wed, 1 Apr 2015 00:12:49 +0100 Subject: [PATCH] Recipe/docs for the Black Hole Talisman. --- .../botania/common/crafting/ModCraftingRecipes.java | 9 +++++++++ .../java/vazkii/botania/common/lexicon/LexiconData.java | 8 ++++++-- src/main/java/vazkii/botania/common/lib/LibLexicon.java | 5 +++-- src/main/resources/assets/botania/lang/en_US.lang | 7 +++++++ 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index a303a57d7..c0889d22e 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -246,6 +246,7 @@ public final class ModCraftingRecipes { public static IRecipe recipePump; public static List recipesPetalsDouble; public static IRecipe recipeKeepIvy; + public static IRecipe recipeBlackHoleTalisman; public static void init() { // Lexicon Recipe @@ -1631,6 +1632,14 @@ public final class ModCraftingRecipes { addShapelessOreDictRecipe(new ItemStack(ModItems.keepIvy), LibOreDict.PIXIE_DUST, new ItemStack(Blocks.vine), LibOreDict.ENDER_AIR_BOTTLE); recipeKeepIvy = BotaniaAPI.getLatestAddedRecipe(); + // Black Hole Talisman Recipe + addOreDictRecipe(new ItemStack(ModItems.blackHoleTalisman), + " G ", "EAE", " E ", + 'G', LibOreDict.LIFE_ESSENCE, + 'E', LibOreDict.ELEMENTIUM, + 'A', LibOreDict.ENDER_AIR_BOTTLE); + recipeBlackHoleTalisman = BotaniaAPI.getLatestAddedRecipe(); + // Storage Block 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 ef7e2101c..d18bbceb6 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -190,6 +190,7 @@ public final class LexiconData { public static LexiconEntry endStoneDecor; public static LexiconEntry spawnerMover; public static LexiconEntry keepIvy; + public static LexiconEntry blackHoleTalisman; public static LexiconEntry baublesIntro; public static LexiconEntry cosmeticBaubles; @@ -708,12 +709,15 @@ public final class LexiconData { endStoneDecor = new BLexiconEntry(LibLexicon.ENDER_END_STONE_DECOR, categoryEnder); endStoneDecor.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeEndStoneBricks), new PageCraftingRecipe("2", ModCraftingRecipes.recipeEndStoneChiseledBricks)); - spawnerMover = new ALexiconEntry(LibLexicon.TOOL_SPAWNER_MOVER, categoryEnder); + spawnerMover = new ALexiconEntry(LibLexicon.ENDER_SPAWNER_MOVER, categoryEnder); spawnerMover.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeSpawnerMover)); - keepIvy = new ALexiconEntry(LibLexicon.TOOL_KEEP_IVY, categoryEnder); + keepIvy = new ALexiconEntry(LibLexicon.ENDER_KEEP_IVY, categoryEnder); keepIvy.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeKeepIvy)); + blackHoleTalisman = new ALexiconEntry(LibLexicon.ENDER_BLACK_HOLE_TALISMAN, categoryEnder); + blackHoleTalisman.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipeBlackHoleTalisman)); + // BAUBLES ENTRIES baublesIntro = new BLexiconEntry(LibLexicon.BAUBLE_INTRO, categoryBaubles); baublesIntro.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_BAUBLES), new PageText("2")); diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index b09407e9d..0c592a332 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -125,7 +125,6 @@ public final class LibLexicon { public static final String TOOL_WATER_ROD = "waterRod"; public static final String TOOL_ELF_GEAR = "elfGear"; public static final String TOOL_OPEN_BUCKET = "openBucket"; - public static final String TOOL_SPAWNER_MOVER = "spawnerMover"; public static final String TOOL_RAINBOW_ROD = "rainbowRod"; public static final String TOOL_TORNADO_ROD = "tornadoRod"; public static final String TOOL_FIRE_ROD = "fireRod"; @@ -148,7 +147,6 @@ public final class LibLexicon { public static final String TOOL_OVERGROWTH_SEED = "overgrowthSeed"; public static final String TOOL_LIVINGWOOD_BOW = "livingwoodBow"; public static final String TOOL_CRYSTAL_BOW = "crystalBow"; - public static final String TOOL_KEEP_IVY = "keepIvy"; public static final String ENDER_AIR = "enderAir"; public static final String ENDER_ENDER_EYE_BLOCK = "enderEyeBlock"; @@ -162,6 +160,9 @@ public final class LibLexicon { public static final String ENDER_CORPOREA_INDEX = "corporeaIndex"; public static final String ENDER_CORPOREA_FUNNEL = "corporeaFunnel"; public static final String ENDER_END_STONE_DECOR = "endStoneDecor"; + public static final String ENDER_SPAWNER_MOVER = "spawnerMover"; + public static final String ENDER_KEEP_IVY = "keepIvy"; + public static final String ENDER_BLACK_HOLE_TALISMAN = "blackHoleTalisman"; public static final String BAUBLE_INTRO = "bIntro"; public static final String BAUBLE_COSMETIC = "cosmeticBaubles"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index ee2dae7ec..929d31e74 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -2255,6 +2255,13 @@ botania.entry.keepIvy=Resolute Ivy botania.page.keepIvy0=Everyone knows that before being ressurected, one's items splatter all over the ground, generally a massive nuisance. The fix for this is rather simple. By attaching a piece of &1Resolute Ivy&0 to an item through a crafting grid, that item will presist on one's inventory through death. The ivy will degenerate after that fact and will need to be applied again if one wishes to have the item survive another downfall. botania.page.keepIvy1=Because people die when they are killed +# -- BLACK HOLE TALISMAN +botania.entry.blackHoleTalisman=Black Hole Talisman +botania.page.blackHoleTalisman0=The void is a massive space full of... void, really. There's nothing there. But with some ingenuity, this space can be used to store items to your heart's content.
The &1Black Hole Talisman&0 utilizes powerful Gaia and Ender magic to allow for a virtually infinite quantity of a single type of block to be stored in this space. +botania.page.blackHoleTalisman1=Right clicking a block in the world will set the talisman to store that type of block. This can only be done if the talisman is empty. Next off, shift-right clicking the talisman in the air will enable or disable it. Whilst enabled and in the user's inventory, it'll try to keep a stack, and only a stack, of the block type in question, pulling and pushing blocks between the inventory and the void. +botania.page.blackHoleTalisman2=While the talisman has any contents in it, the blocks in it can be placed as if they were normal blocks stored in the inventory via a simple right click with it.
Right clicking an inventory will try to fill it with the blocks stored in the talisman. +botania.page.blackHoleTalisman3=Like a Rageki but twice as fun + # - BAUBLES AND ACESSORIES # -- AN INTRODUCTION TO BAUBLES botania.entry.bIntro=An Introduction to Baubles