From 1fd20b90f6d04997ff57dde41daad0e5ad918d03 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 11 Jun 2014 02:51:07 +0100 Subject: [PATCH] Added a recipe to turn slimeballs into cactus. --- .../botania/common/crafting/ModManaAlchemyRecipes.java | 7 +++++-- MODSRC/vazkii/botania/common/lexicon/LexiconData.java | 2 +- resources/assets/botania/lang/en_US.lang | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/MODSRC/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java index 11b1636f3..48d5ba999 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java @@ -39,7 +39,7 @@ public final class ModManaAlchemyRecipes { public static List gunpowderAndFlintRecipes; public static RecipeManaInfusion nameTagRecipe; public static List stringRecipes; - public static RecipeManaInfusion slimeballRecipe; + public static List slimeballCactusRecipes; public static RecipeManaInfusion enderPearlRecipe; public static List redstoneToGlowstoneRecipes; public static RecipeManaInfusion sandRecipe; @@ -100,7 +100,10 @@ public final class ModManaAlchemyRecipes { for(int i = 0; i < 16; i++) stringRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.string, 3, 1), new ItemStack(Blocks.wool, 1, i), 100)); - slimeballRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.slime_ball, 1), new ItemStack(Blocks.cactus), 1200); + slimeballCactusRecipes = new ArrayList(); + slimeballCactusRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.slime_ball, 1), new ItemStack(Blocks.cactus), 1200)); + slimeballCactusRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.cactus, 1), new ItemStack(Items.slime_ball), 1200)); + enderPearlRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.ender_pearl, 2), new ItemStack(Items.ghast_tear), 28000); redstoneToGlowstoneRecipes = new ArrayList(); diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index ce8df05fa..731b73cd6 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -359,7 +359,7 @@ public final class LexiconData { new PageManaInfusionRecipe("2", ModManaAlchemyRecipes.leatherRecipe), new PageManaInfusionRecipe("3", ModManaAlchemyRecipes.woodRecipes), new PageManaInfusionRecipe("4", ModManaAlchemyRecipes.saplingRecipes), new PageManaInfusionRecipe("5", ModManaAlchemyRecipes.glowstoneDustRecipe), new PageManaInfusionRecipe("6", ModManaAlchemyRecipes.quartzRecipes), new PageManaInfusionRecipe("7", ModManaAlchemyRecipes.chiseledBrickRecipe), new PageManaInfusionRecipe("8", ModManaAlchemyRecipes.iceRecipe), new PageManaInfusionRecipe("9", ModManaAlchemyRecipes.swampFolliageRecipes), new PageManaInfusionRecipe("10", ModManaAlchemyRecipes.fishRecipes), new PageManaInfusionRecipe("11", ModManaAlchemyRecipes.cropRecipes), new PageManaInfusionRecipe("12", ModManaAlchemyRecipes.potatoRecipe), new PageManaInfusionRecipe("13", ModManaAlchemyRecipes.netherWartRecipe), - new PageManaInfusionRecipe("14", ModManaAlchemyRecipes.gunpowderAndFlintRecipes), new PageManaInfusionRecipe("15", ModManaAlchemyRecipes.nameTagRecipe), new PageManaInfusionRecipe("16", ModManaAlchemyRecipes.stringRecipes), new PageManaInfusionRecipe("17", ModManaAlchemyRecipes.slimeballRecipe), + new PageManaInfusionRecipe("14", ModManaAlchemyRecipes.gunpowderAndFlintRecipes), new PageManaInfusionRecipe("15", ModManaAlchemyRecipes.nameTagRecipe), new PageManaInfusionRecipe("16", ModManaAlchemyRecipes.stringRecipes), new PageManaInfusionRecipe("17", ModManaAlchemyRecipes.slimeballCactusRecipes), new PageManaInfusionRecipe("18", ModManaAlchemyRecipes.enderPearlRecipe), new PageManaInfusionRecipe("19", ModManaAlchemyRecipes.redstoneToGlowstoneRecipes), new PageManaInfusionRecipe("20", ModManaAlchemyRecipes.sandRecipe)); openCrate = new BLexiconEntry(LibLexicon.DEVICE_OPEN_CRATE, categoryDevices); diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 4aecd3c59..76309565b 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -833,7 +833,7 @@ botania.page.manaAlchemy13=Conjuring &1Nether Wart&0 botania.page.manaAlchemy14=Converting between &1Gunpowder&0 and &1Flint&0 botania.page.manaAlchemy15=Making &1Name Tags&0 botania.page.manaAlchemy16=Splitting &1Wool&0 into &1String&0 -botania.page.manaAlchemy17=Creating &1Slimeballs&0 +botania.page.manaAlchemy17=Converting between &1Slimeballs&0 and &1Cactus&0 botania.page.manaAlchemy18=Creating &1Ender Pearls&0 botania.page.manaAlchemy19=Converting between &1Glowstone&0 and &1Redstone&0 botania.page.manaAlchemy20=Breaking &1Cobblestone&0 into &1Sand&0