From ea30c6aa4a024a93145b59369b5656ef230200a4 Mon Sep 17 00:00:00 2001 From: ToMe25 <38815969+ToMe25@users.noreply.github.com> Date: Mon, 27 Jan 2020 18:36:00 +0100 Subject: [PATCH] Add a recipe for the Haert of the Sea (#3157) * Add a recipe for the Haert of the Sea Add the infused nautilus shell as a crafting item for the heart of the sea * change the recipe for the Heart of the See to use a Mana Pearl instead of one of the Manasteel ingots * Remove the Infused Nautilus Shell and added an Alchemy Recipe for the Heart of the Sea. * Change the mana cost for the heart of the sea to 20k as blazepowder to mana suggested * Make heart of the sea recipe gog only * fix the lexicon entries getting in the wrong directory --- .../botania/common/crafting/ModManaAlchemyRecipes.java | 4 ++-- src/main/java/vazkii/botania/common/item/ModItems.java | 1 - src/main/resources/assets/botania/lang/en_us.json | 3 ++- .../lexicon/en_us/entries/basics/garden_of_glass.json | 7 ++++++- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java index 39ffb60f4..5d7a05187 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java @@ -11,7 +11,6 @@ package vazkii.botania.common.crafting; import net.minecraft.block.Blocks; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.item.crafting.Ingredient; @@ -98,10 +97,11 @@ public final class ModManaAlchemyRecipes { Blocks.SUNFLOWER, Blocks.LILAC, Blocks.ROSE_BUSH, Blocks.PEONY); evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("chorus_fruit_to_flower"), new ItemStack(Blocks.CHORUS_FLOWER), Ingredient.fromItems(Items.POPPED_CHORUS_FRUIT), 10000)); - + if(Botania.gardenOfGlassLoaded) { evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("prismarine_shard_gog"), new ItemStack(Items.PRISMARINE_SHARD), Ingredient.fromItems(Items.QUARTZ), 1000)); evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("prismarine_crystals_gog"), new ItemStack(Items.PRISMARINE_CRYSTALS), Ingredient.fromItems(Items.PRISMARINE_SHARD), 500)); + evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("heart_of_the_sea"), new ItemStack(Items.HEART_OF_THE_SEA), Ingredient.fromItems(Items.NAUTILUS_SHELL), 20000)); } evt.manaInfusion().accept(mini(ModSubtiles.agricarnationChibi, ModSubtiles.agricarnation)); diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index ce7a296b9..171cb8b1b 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -16,7 +16,6 @@ import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.DyeColor; import net.minecraft.item.Food; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.item.Rarity; import net.minecraft.item.crafting.IRecipeSerializer; import net.minecraft.potion.EffectInstance; diff --git a/src/main/resources/assets/botania/lang/en_us.json b/src/main/resources/assets/botania/lang/en_us.json index 32c67cf8d..09102f35d 100644 --- a/src/main/resources/assets/botania/lang/en_us.json +++ b/src/main/resources/assets/botania/lang/en_us.json @@ -1708,6 +1708,7 @@ "botania.page.gardenOfGlass9": "Entering the $(thing)Nether$(0) might seem difficult under these conditions-- worry not, however, as $(l:misc/blaze_block)$(item)Blaze Meshes$(0)$(/l) (as mentioned previously) can be converted into $(item)Obsidian$(0). To get these lamps, spawn $(item)Blazes$(0) from $(l:devices/fel_pumpkin)$(item)Fel Pumpkins$(0)$(/l).$(p)Since there's no easily accessible $(item)Flint$(0) on an island in space, a $(item)Fire Charge$(0) will have to do for portal-opening.", "botania.page.gardenOfGlass11": "The $(item)Mana Flash$(0) present in the starting area will allow a player without a $(l:basics/lexicon)$(item)Lexica Botania$(0)$(/l) to exchange a $(item)Sapling$(0) for one, by right-clicking the $(item)Sapling$(0) on the $(item)Mana Flash$(0).", "botania.page.gardenOfGlass12": "Lastly, a way to reach the End", + "botania.page.gardenOfGlass14": "Creating the $(item)Heart of the Sea$(0)", "botania.entry.lexicon": "Lexica Botania", "botania.tagline.lexicon": "What you're reading right now, dummy", @@ -2287,11 +2288,11 @@ "botania.page.manaAlchemy20": "Breaking $(item)Cobblestone$(0) into $(item)Sand$(0)", "botania.page.manaAlchemy21": "Breaking $(item)Hardened Clay$(0) into $(item)Red Sand$(0)", "botania.page.manaAlchemy22": "Breaking down $(item)Clay$(0) and $(item)Bricks$(0)", - "botania.page.manaAlchemy27": "Converting $(item)Chorus Fruit$(0) into $(item)Chorus Flowers$(0)", "botania.page.manaAlchemy23": "Making $(item)Coarse Dirt$(0)", "botania.page.manaAlchemy24": "Transmuting $(item)Tall Grasses$(0)", "botania.page.manaAlchemy25": "Transmuting mundane flowers", "botania.page.manaAlchemy26": "Transmuting stones", + "botania.page.manaAlchemy27": "Converting $(item)Chorus Fruit$(0) into $(item)Chorus Flowers$(0)", "botania.entry.brewery": "Botanical Brewery", "botania.tagline.brewery": "Create brews: better potions", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/garden_of_glass.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/garden_of_glass.json index 2ffd3898a..d69c81e17 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/garden_of_glass.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/garden_of_glass.json @@ -63,7 +63,12 @@ "type": "crafting", "text": "botania.page.gardenOfGlass12", "recipe": "gardenofglass:end_portal_frame" - } + }, + { + "type": "mana_infusion", + "text": "botania.page.gardenOfGlass14", + "recipes": "botania:heart_of_the_sea" + }, ], "extra_recipe_mappings": { "botania:root": 1