From 6a6dfe094c4b2718181a9eeee3275d97c1471b69 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sun, 11 Sep 2016 19:28:47 +0100 Subject: [PATCH] Move stone transmutation to the main alchemy page. Also removed the prismarine recipe. Closes #1882 --- .../common/crafting/ModManaAlchemyRecipes.java | 3 --- .../vazkii/botania/common/lexicon/LexiconData.java | 9 ++------- src/main/resources/assets/botania/lang/en_US.lang | 14 ++------------ 3 files changed, 4 insertions(+), 22 deletions(-) diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java index 1f4dff2bd..534e1bc58 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java @@ -47,7 +47,6 @@ public final class ModManaAlchemyRecipes { public static RecipeManaInfusion redSandRecipe; public static List clayBreakdownRecipes; public static RecipeManaInfusion coarseDirtRecipe; - public static RecipeManaInfusion prismarineRecipe; public static List stoneRecipes; public static List tallgrassRecipes; public static List flowersRecipes; @@ -129,8 +128,6 @@ public final class ModManaAlchemyRecipes { coarseDirtRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.DIRT, 1, 1), new ItemStack(Blocks.DIRT), 120); - prismarineRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.PRISMARINE_SHARD), new ItemStack(Items.QUARTZ), 200); - stoneRecipes = new ArrayList<>(); stoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.STONE, 1, 5), new ItemStack(Blocks.STONE), 200)); // Stone->Andesite stoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.STONE, 1, 3), new ItemStack(Blocks.STONE, 1, 5), 200)); // Andesite->Diorite diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index d80c4eb19..9b7133724 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -276,7 +276,6 @@ public final class LexiconData { public static LexiconEntry starfield; public static LexiconEntry mushrooms; public static LexiconEntry phantomInk; - public static LexiconEntry stoneAlchemy; public static LexiconEntry blazeBlock; public static LexiconEntry challenges; public static LexiconEntry cacophonium; @@ -423,8 +422,7 @@ public final class LexiconData { new PageManaInfusionRecipe("11", ModManaInfusionRecipes.managlassRecipe), new PageManaInfusionRecipe("12", ModManaInfusionRecipes.manaStringRecipe), new PageCraftingRecipe("13", ModCraftingRecipes.recipeCobweb), - new PageManaInfusionRecipe("7", ModManaInfusionRecipes.manaCookieRecipe), - new PageManaInfusionRecipe("15", ModManaAlchemyRecipes.prismarineRecipe)) + new PageManaInfusionRecipe("7", ModManaInfusionRecipes.manaCookieRecipe)) .setIcon(new ItemStack(ModBlocks.pool)); sparks = new BasicLexiconEntry(LibLexicon.MANA_SPARKS, categoryMana); @@ -712,6 +710,7 @@ public final class LexiconData { new PageManaInfusionRecipe("19", ModManaAlchemyRecipes.redstoneToGlowstoneRecipes), new PageManaInfusionRecipe("20", ModManaAlchemyRecipes.sandRecipe), new PageManaInfusionRecipe("21", ModManaAlchemyRecipes.redSandRecipe), + new PageManaInfusionRecipe("26", ModManaAlchemyRecipes.stoneRecipes), new PageManaInfusionRecipe("22", ModManaAlchemyRecipes.clayBreakdownRecipes), new PageManaInfusionRecipe("24", ModManaAlchemyRecipes.tallgrassRecipes), new PageManaInfusionRecipe("25", ModManaAlchemyRecipes.flowersRecipes), @@ -1351,10 +1350,6 @@ public final class LexiconData { phantomInk = new BasicLexiconEntry(LibLexicon.MISC_PHANTOM_INK, categoryMisc); phantomInk.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipePhantomInk)); - stoneAlchemy = new BasicLexiconEntry(LibLexicon.MISC_STONE_ALCHEMY, categoryMisc); - stoneAlchemy.setLexiconPages(new PageText("0"), - new PageManaInfusionRecipe("1", ModManaAlchemyRecipes.stoneRecipes)); - blazeBlock = new BasicLexiconEntry(LibLexicon.MISC_BLAZE_BLOCK, categoryMisc); blazeBlock.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeBlazeBlock)); LexiconRecipeMappings.map(new ItemStack(Blocks.OBSIDIAN), blazeBlock, 0); diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index ddcd03f96..5c2a99ac5 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -2596,6 +2596,8 @@ botania.page.manaAlchemy22=Breaking down &1Clay&0 and &1Bricks&0 botania.page.manaAlchemy23=Making &1Coarse Dirt&0 botania.page.manaAlchemy24=Transmuting &1Tall Grass&0 types botania.page.manaAlchemy25=Transmuting mundane flowers +botania.page.manaAlchemy26=Transmuting stones + # -- BOTANICAL BREWERY botania.entry.brewery=Botanical Brewery @@ -3706,18 +3708,6 @@ botania.tagline.phantomInk=Make your armor and baubles invisible botania.page.phantomInk0=Having your beautiful skin and accessories under a set of metal armor is nobody's dream. It's bulky, flat, and worst of all, not fashionable!
Luckilly, by tinging this horrendous armor with &1Phantom Ink&0 in a crafting grid, the armor will be completely invisible, while still providing all of its benefits. This will only work with armor sets that can use &4Mana&0. botania.page.phantomInk1=Who you gonna call? -# -- STONE ALCHEMY -botania.entry.stoneAlchemy=Stone Alchemy -botania.tagline.stoneAlchemy=Create new stone types -botania.page.stoneAlchemy0=Using an &1Alchemy Catalyst&0 proves to be a decently functional method of generating new types of &1Stone&0. Simple deal, tossing a piece of &1Stone&0 into the catalized pool will transform it into another in a cycle.
Stairs and slabs can be made from the rough and brick variants of these. -botania.page.stoneAlchemy1=Creating the stones -botania.page.stoneAlchemy2=Brickage -botania.page.stoneAlchemy3=Chiseling - -#botania.page.stoneAlchemy2=Polish -#botania.page.stoneAlchemy3=Brickage -#botania.page.stoneAlchemy4=Chiseling - # -- BLAZE LIGHT botania.entry.blazeBlock=Blaze Light botania.tagline.blazeBlock=Compact blaze storage and a renewable obsidian source