diff --git a/MODSRC/vazkii/botania/common/block/BlockAlchemyCatalyst.java b/MODSRC/vazkii/botania/common/block/BlockAlchemyCatalyst.java index 92b5000fa..ca9f1e506 100644 --- a/MODSRC/vazkii/botania/common/block/BlockAlchemyCatalyst.java +++ b/MODSRC/vazkii/botania/common/block/BlockAlchemyCatalyst.java @@ -11,14 +11,20 @@ */ package vazkii.botania.common.block; +import vazkii.botania.api.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.minecraft.world.World; -public class BlockAlchemyCatalyst extends BlockMod { +public class BlockAlchemyCatalyst extends BlockMod implements ILexiconable { IIcon[] icons; @@ -41,5 +47,10 @@ public class BlockAlchemyCatalyst extends BlockMod { public IIcon getIcon(int par1, int par2) { return icons[Math.min(2, par1)]; } + + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.alchemy; + } } diff --git a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java index 7a6580611..658e6f2d2 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java @@ -107,6 +107,7 @@ public final class ModCrafingRecipes { public static IRecipe recipeLifeEssence; public static IRecipe recipeGoldenLaurel; public static IRecipe recipeTinyPlanetBlock; + public static IRecipe recipeAlchemyCatalyst; public static void init() { // Lexicon Recipe @@ -558,6 +559,15 @@ public final class ModCrafingRecipes { 'S', "stone", 'P', ModItems.tinyPlanet); recipeTinyPlanetBlock = BotaniaAPI.getLatestAddedRecipe(); + + // Alchemy Catalyst Recipe + addOreDictRecipe(new ItemStack(ModBlocks.alchemyCatalyst), + "SGS", "BPB", "SGS", + 'S', LibOreDict.LIVING_ROCK, + 'G', "ingotGold", + 'B', new ItemStack(Items.brewing_stand), + 'P', LibOreDict.MANA_PEARL); + recipeAlchemyCatalyst = BotaniaAPI.getLatestAddedRecipe(); } private static void addOreDictRecipe(ItemStack output, Object... recipe) { diff --git a/MODSRC/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java index f2c07dd43..31b968b9e 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java @@ -11,6 +11,10 @@ */ package vazkii.botania.common.crafting; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import vazkii.botania.api.BotaniaAPI; @@ -19,9 +23,66 @@ import vazkii.botania.api.recipe.RecipeManaInfusion; public final class ModManaAlchemyRecipes { public static RecipeManaInfusion leatherRecipe; + public static List woodRecipes; + public static List saplingRecipes; + public static RecipeManaInfusion glowstoneDustRecipe; + public static RecipeManaInfusion netherQuartzRecipe; + public static RecipeManaInfusion chiseledBrickRecipe; + public static RecipeManaInfusion iceRecipe; + public static List swampFolliageRecipes; + public static List fishRecipes; + public static List cropRecipes; + public static RecipeManaInfusion potatoRecipe; + public static RecipeManaInfusion netherWartRecipe; + public static List gunpowderAndFlintRecipes; + public static RecipeManaInfusion nameTagRecipe; + public static RecipeManaInfusion enderPearlRecipe; + public static RecipeManaInfusion sandRecipe; public static void init() { leatherRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.leather), new ItemStack(Items.rotten_flesh), 600); + + woodRecipes = new ArrayList(); + woodRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.log, 1, 0), new ItemStack(Blocks.log2, 1, 1), 40)); + woodRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.log, 1, 1), new ItemStack(Blocks.log, 1, 0), 40)); + woodRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.log, 1, 2), new ItemStack(Blocks.log, 1, 1), 40)); + woodRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.log, 1, 3), new ItemStack(Blocks.log, 1, 2), 40)); + woodRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.log2, 1, 0), new ItemStack(Blocks.log, 1, 3), 40)); + woodRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.log2, 1, 1), new ItemStack(Blocks.log2, 1, 0), 40)); + + saplingRecipes = new ArrayList(); + for(int i = 0; i < 6; i++) + saplingRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.sapling, 1, i == 5 ? 0 : i + 1), new ItemStack(Blocks.sapling, 1, i), 120)); + + glowstoneDustRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.glowstone_dust, 4), new ItemStack(Blocks.glowstone), 25); + netherQuartzRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.quartz, 4), new ItemStack(Blocks.quartz_block), 25); + chiseledBrickRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.stonebrick, 1, 3), new ItemStack(Blocks.stonebrick), 150); + iceRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.ice), new ItemStack(Blocks.snow), 2250); + + swampFolliageRecipes = new ArrayList(); + swampFolliageRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.waterlily), new ItemStack(Blocks.vine), 320)); + swampFolliageRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.vine), new ItemStack(Blocks.waterlily), 320)); + + fishRecipes = new ArrayList(); + for(int i = 0; i < 4; i++) + fishRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.fish, 1, i == 3 ? 0 : i + 1), new ItemStack(Items.fish, 1, i), 200)); + + cropRecipes = new ArrayList(); + cropRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.wheat_seeds), new ItemStack(Items.pumpkin_seeds), 6000)); + cropRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.potato), new ItemStack(Items.wheat), 6000)); + cropRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.carrot), new ItemStack(Items.potato), 6000)); + cropRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.melon_seeds), new ItemStack(Items.carrot), 6000)); + cropRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.pumpkin_seeds), new ItemStack(Items.melon_seeds), 6000)); + + potatoRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.potato), new ItemStack(Items.poisonous_potato), 1200); + netherWartRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.nether_wart), new ItemStack(Items.blaze_rod), 4000); + + gunpowderAndFlintRecipes = new ArrayList(); + gunpowderAndFlintRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.flint), new ItemStack(Items.gunpowder), 200)); + gunpowderAndFlintRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.gunpowder), new ItemStack(Items.flint), 4000)); + + nameTagRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.name_tag), new ItemStack(Items.writable_book), 16000); + enderPearlRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.ender_pearl, 2), new ItemStack(Items.ghast_tear), 28000); + sandRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.sand), new ItemStack(Blocks.cobblestone), 50); } - } diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index 719302ef8..ac20306d0 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -19,6 +19,7 @@ import vazkii.botania.api.lexicon.LexiconRecipeMappings; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.crafting.ModCrafingRecipes; +import vazkii.botania.common.crafting.ModManaAlchemyRecipes; import vazkii.botania.common.crafting.ModManaInfusionRecipes; import vazkii.botania.common.crafting.ModPetalRecipes; import vazkii.botania.common.crafting.ModRuneRecipes; @@ -97,6 +98,7 @@ public final class LexiconData { public static LexiconEntry pylon; public static LexiconEntry manaEnchanting; public static LexiconEntry turntable; + public static LexiconEntry alchemy; public static LexiconEntry manaBlaster; public static LexiconEntry grassSeeds; @@ -296,6 +298,13 @@ public final class LexiconData { turntable = new BLexiconEntry(LibLexicon.DEVICE_TURNTABLE, categoryDevices); turntable.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeTurntable)); + alchemy = new BLexiconEntry(LibLexicon.DEVICE_ALCHEMY, categoryDevices); + alchemy.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeAlchemyCatalyst), + new PageManaInfusionRecipe("2", ModManaAlchemyRecipes.leatherRecipe), new PageManaInfusionRecipe("3", ModManaAlchemyRecipes.woodRecipes), new PageManaInfusionRecipe("4", ModManaAlchemyRecipes.saplingRecipes), new PageManaInfusionRecipe("5", ModManaAlchemyRecipes.glowstoneDustRecipe), + new PageManaInfusionRecipe("6", ModManaAlchemyRecipes.netherQuartzRecipe), 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.enderPearlRecipe), new PageManaInfusionRecipe("17", ModManaAlchemyRecipes.sandRecipe)); + // TOOLS ENTRIES manaBlaster = new BLexiconEntry(LibLexicon.TOOL_MANA_BLASTER, categoryTools); manaBlaster.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCrafingRecipes.recipeManaBlaster)); diff --git a/MODSRC/vazkii/botania/common/lib/LibLexicon.java b/MODSRC/vazkii/botania/common/lib/LibLexicon.java index 8b29c914c..0a19fb839 100644 --- a/MODSRC/vazkii/botania/common/lib/LibLexicon.java +++ b/MODSRC/vazkii/botania/common/lib/LibLexicon.java @@ -79,6 +79,7 @@ public final class LibLexicon { public static final String DEVICE_PYLON = "pylon"; public static final String DEVICE_MANA_ENCHANTING = "manaEnchanting"; public static final String DEVICE_TURNTABLE = "turntable"; + public static final String DEVICE_ALCHEMY = "manaAlchemy"; public static final String TOOL_MANA_BLASTER = "manaBlaster"; public static final String TOOL_GRASS_SEEDS = "grassSeeds"; diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 5102668b7..6cde57b82 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -647,6 +647,27 @@ botania.entry.turntable=Spreader Turntable botania.page.turntable0=The &1Spreader Turntable&0, as it's name implies, can turn &1Mana Spreaders&0 around and around. Placing a spreader above the turntable will rotate it, given that a redstone signal isn't applied.
To change the speed of the turntable, right click with a &1Wand of the Forest&0, shift-right clicking will invert the movement. botania.page.turntable1=Spin spin spin spin +# -- BOTANICAL ALCHEMY +botania.entry.manaAlchemy=Alchemising with Mana +botania.page.manaAlchemy0=&4Mana&0 is an extremely volatile substance, to a point that it's complete properties and abilities are unknown.
One of them is known, though, by attaching an &1Alchemy Catalyst&0, created with a mixture of otherworldly materials to the bottom of a &1Mana Pool&0, it enables the pool to perform &4Alchemy&0. +botania.page.manaAlchemy1=Creating the &1Catalyst&0 +botania.page.manaAlchemy2=&1Rotten Flesh&0 to &1Leather&0 +botania.page.manaAlchemy3=Various types of &1Wood&0 +botania.page.manaAlchemy4=Various types of &1Saplings&0 +botania.page.manaAlchemy5=Breaking down &1Glowstone Blocks&0 +botania.page.manaAlchemy6=Breaking down &1Quartz Blocks&0 +botania.page.manaAlchemy7=Creating &1Chiseled Stone Bricks&0 +botania.page.manaAlchemy8=Further freezing &1Snow&0 into &1Ice&0 +botania.page.manaAlchemy9=Converting between &1Vines&0 and &1Lilypads&0 +botania.page.manaAlchemy10=Various breeds of &1Fish&0 +botania.page.manaAlchemy11=Transmuting &1Seeds&0 and &1Crops&0 +botania.page.manaAlchemy12=Purifying &1Poisonous Potatos&0 +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=Creating &1Ender Pearls&0 +botania.page.manaAlchemy17=Breaking &1Cobblestone&0 into &1Sand&0 + # - MYSTICAL INSTRUMENTS # -- MANA BLASTER botania.entry.manaBlaster=Mana Blaster