From a93b62c7c7529a57b01ad52963e22723aaadb438 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Tue, 31 Mar 2015 23:01:21 +0100 Subject: [PATCH] Moved Resolute Ivy and the Life Aggregator to the Ender Artifacts section. --- .../common/crafting/ModCraftingRecipes.java | 5 +++-- .../botania/common/lexicon/LexiconData.java | 16 +++++++-------- .../resources/assets/botania/lang/en_US.lang | 20 +++++++++---------- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index c648d086d..a303a57d7 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -903,9 +903,10 @@ public final class ModCraftingRecipes { // Life Aggregator Recipe addOreDictRecipe(new ItemStack(ModItems.spawnerMover), - "EIE", "IDI", "EIE", + "EIE", "ADA", "EIE", 'E', LibOreDict.LIFE_ESSENCE, 'I', LibOreDict.ELEMENTIUM, + 'A', LibOreDict.ENDER_AIR_BOTTLE, 'D', LibOreDict.DRAGONSTONE); recipeSpawnerMover = BotaniaAPI.getLatestAddedRecipe(); @@ -1627,7 +1628,7 @@ public final class ModCraftingRecipes { recipesPetalsDouble = BotaniaAPI.getLatestAddedRecipes(16); // Resolute Ivy Recipe - addShapelessOreDictRecipe(new ItemStack(ModItems.keepIvy), LibOreDict.PIXIE_DUST, new ItemStack(Blocks.vine)); + addShapelessOreDictRecipe(new ItemStack(ModItems.keepIvy), LibOreDict.PIXIE_DUST, new ItemStack(Blocks.vine), LibOreDict.ENDER_AIR_BOTTLE); recipeKeepIvy = BotaniaAPI.getLatestAddedRecipe(); // Storage Block Recipes diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 3eded8b93..ef7e2101c 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -153,7 +153,6 @@ public final class LexiconData { public static LexiconEntry waterRod; public static LexiconEntry elfGear; public static LexiconEntry openBucket; - public static LexiconEntry spawnerMover; public static LexiconEntry rainbowRod; public static LexiconEntry tornadoRod; public static LexiconEntry fireRod; @@ -176,7 +175,6 @@ public final class LexiconData { public static LexiconEntry overgrowthSeed; public static LexiconEntry livingwoodBow; public static LexiconEntry crystalBow; - public static LexiconEntry keepIvy; public static LexiconEntry enderAir; public static LexiconEntry enderEyeBlock; @@ -190,6 +188,8 @@ public final class LexiconData { public static LexiconEntry corporeaIndex; public static LexiconEntry corporeaFunnel; public static LexiconEntry endStoneDecor; + public static LexiconEntry spawnerMover; + public static LexiconEntry keepIvy; public static LexiconEntry baublesIntro; public static LexiconEntry cosmeticBaubles; @@ -599,9 +599,6 @@ public final class LexiconData { openBucket = new ALexiconEntry(LibLexicon.TOOL_OPEN_BUCKET, categoryTools); openBucket.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeOpenBucket)); - spawnerMover = new ALexiconEntry(LibLexicon.TOOL_SPAWNER_MOVER, categoryTools); - spawnerMover.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeSpawnerMover)); - rainbowRod = new ALexiconEntry(LibLexicon.TOOL_RAINBOW_ROD, categoryTools); rainbowRod.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeRainbowRod)); @@ -667,9 +664,6 @@ public final class LexiconData { crystalBow = new ALexiconEntry(LibLexicon.TOOL_CRYSTAL_BOW, categoryTools); crystalBow.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeCrystalBow)); - - keepIvy = new ALexiconEntry(LibLexicon.TOOL_KEEP_IVY, categoryTools); - keepIvy.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeKeepIvy)); // ENDER ENTRIES enderAir = new BLexiconEntry(LibLexicon.ENDER_AIR, categoryEnder); @@ -714,6 +708,12 @@ 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.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeSpawnerMover)); + + keepIvy = new ALexiconEntry(LibLexicon.TOOL_KEEP_IVY, categoryEnder); + keepIvy.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeKeepIvy)); + // 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/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index bdf14853d..9e141e8ae 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -2031,11 +2031,6 @@ botania.entry.openBucket=Extrapolated Bucket botania.page.openBucket0=By creating a bucket out of &1Elementium&0 one seems to notice an interesting feature. The liquids acquired by it simply vanish into the ether, never to be seen again. This seems like a great clean up tool. botania.page.openBucket1=A Souvenir from Lewis -# -- LIFE AGGREGATOR -botania.entry.spawnerMover=Life Aggregator -botania.page.spawnerMover0=By arranging &1Dragonstone&0, &1Elementium&0 and &1Gaia Spirits&0 in a specific pattern, one can create a device that can contain the curious energies of a &1Monster Spawner&0 and materialize it in another point in space.
It's to note that the device will shatter after being used once. -botania.page.spawnerMover1=We got the spawner, but this isn't a won run yet - # -- ROD OF BIFROST botania.entry.rainbowRod=Rod of the Bifrost botania.page.rainbowRod0=&4Bifrost&0, the rainbow bridge that reaches between the world and the realm of the gods.
While this item, the &1Rod of the Bifrost&0 doesn't exactly do that, it allows the holder, via a right click and at the cost of some &4Mana&0, to create a rainbow bridge in the direction he or she is looking at. @@ -2155,11 +2150,6 @@ botania.entry.crystalBow=Crystal Bow botania.page.crystalBow0=Crafted with &1Dragonstone&0, the &1Crystal Bow&0 is a ranged weapon with the capacity to generate arrows from &4Mana&0. Similarly to the &1Livingwood Bow&0, it'll repair using &4Mana&0 as well, but carrying &1Arrows&0 is not required as they are created through the magical energies.
Given the lightweight and flexible structure of the bow, it can also fire at a much increased velocity than a conventional wooden one. botania.page.crystalBow1=The elves are roving -# -- RESOLUTE IVY -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 - # - ENDER ARTEFACTS # -- EXTRACTING ENDER AIR botania.entry.enderAir=Extracting Ender Air @@ -2252,6 +2242,16 @@ botania.page.endStoneDecor0=Similarly to other stone blocks, &1End Stone&0 can b botania.page.endStoneDecor1=Making &1End Stone Bricks&0 botania.page.endStoneDecor2=Making &1Chiseled End Stone Bricks&0 +# -- LIFE AGGREGATOR +botania.entry.spawnerMover=Life Aggregator +botania.page.spawnerMover0=By arranging &1Dragonstone&0, &1Elementium&0 and &1Gaia Spirits&0 in a specific pattern, one can create a device that can contain the curious energies of a &1Monster Spawner&0 and materialize it in another point in space.
It's to note that the device will shatter after being used once. +botania.page.spawnerMover1=We got the spawner, but this isn't a won run yet + +# -- RESOLUTE IVY +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 + # - BAUBLES AND ACESSORIES # -- AN INTRODUCTION TO BAUBLES botania.entry.bIntro=An Introduction to Baubles