From 024fda0f702c1d491139b71c9ead5402edb252a6 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Fri, 20 Jun 2014 16:41:34 +0100 Subject: [PATCH] Added the effect of the Conjuration Catalyst. --- .../block/BlockConjurationCatalyst.java | 9 ++++ .../common/core/proxy/CommonProxy.java | 2 + .../common/crafting/ModCrafingRecipes.java | 10 +++++ .../crafting/ModManaConjurationRecipes.java | 42 +++++++++++++++++++ .../botania/common/lexicon/LexiconData.java | 6 +++ .../vazkii/botania/common/lib/LibLexicon.java | 1 + 6 files changed, 70 insertions(+) create mode 100644 MODSRC/vazkii/botania/common/crafting/ModManaConjurationRecipes.java diff --git a/MODSRC/vazkii/botania/common/block/BlockConjurationCatalyst.java b/MODSRC/vazkii/botania/common/block/BlockConjurationCatalyst.java index 30a466ea7..ebb8b2c25 100644 --- a/MODSRC/vazkii/botania/common/block/BlockConjurationCatalyst.java +++ b/MODSRC/vazkii/botania/common/block/BlockConjurationCatalyst.java @@ -11,6 +11,11 @@ */ package vazkii.botania.common.block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; public class BlockConjurationCatalyst extends BlockAlchemyCatalyst { @@ -19,4 +24,8 @@ public class BlockConjurationCatalyst extends BlockAlchemyCatalyst { super(LibBlockNames.CONJURATION_CATALYST); } + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.conjurationCatalyst; + } } diff --git a/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java b/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java index 4ed46aecb..a11ebe296 100644 --- a/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java @@ -33,6 +33,7 @@ import vazkii.botania.common.core.version.CommandDownloadLatest; import vazkii.botania.common.crafting.ModCrafingRecipes; import vazkii.botania.common.crafting.ModElvenTradeRecipes; import vazkii.botania.common.crafting.ModManaAlchemyRecipes; +import vazkii.botania.common.crafting.ModManaConjurationRecipes; import vazkii.botania.common.crafting.ModManaInfusionRecipes; import vazkii.botania.common.crafting.ModPetalRecipes; import vazkii.botania.common.crafting.ModRuneRecipes; @@ -64,6 +65,7 @@ public class CommonProxy { ModRuneRecipes.init(); ModManaInfusionRecipes.init(); ModManaAlchemyRecipes.init(); + ModManaConjurationRecipes.init(); ModElvenTradeRecipes.init(); LexiconData.init(); diff --git a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java index a90e1b4ef..a43ae0df3 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java @@ -141,6 +141,7 @@ public final class ModCrafingRecipes { public static IRecipe recipeElementiumShears; public static IRecipe recipeElementiumSword; public static IRecipe recipeOpenBucket; + public static IRecipe recipeConjurationCatalyst; public static void init() { // Lexicon Recipe @@ -791,6 +792,15 @@ public final class ModCrafingRecipes { "E E", " E ", 'E', LibOreDict.ELEMENTIUM); recipeOpenBucket = BotaniaAPI.getLatestAddedRecipe(); + + // Conjuration Catalyst Recipe + addOreDictRecipe(new ItemStack(ModBlocks.conjurationCatalyst), + "SBS", "GPG", "SGS", + 'S', LibOreDict.LIVING_ROCK, + 'G', LibOreDict.ELEMENTIUM, + 'B',LibOreDict.PIXIE_DUST, + 'P', new ItemStack(ModBlocks.alchemyCatalyst)); + recipeConjurationCatalyst = BotaniaAPI.getLatestAddedRecipe(); // Mana and Terrasteel Block Recipes addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0), diff --git a/MODSRC/vazkii/botania/common/crafting/ModManaConjurationRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModManaConjurationRecipes.java new file mode 100644 index 000000000..64c3503e6 --- /dev/null +++ b/MODSRC/vazkii/botania/common/crafting/ModManaConjurationRecipes.java @@ -0,0 +1,42 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Jun 20, 2014, 3:57:02 PM (GMT)] + */ +package vazkii.botania.common.crafting; + +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.recipe.RecipeManaInfusion; + +public class ModManaConjurationRecipes { + + public static RecipeManaInfusion redstoneRecipe; + public static RecipeManaInfusion glowstoneRecipe; + public static RecipeManaInfusion quartzRecipe; + public static RecipeManaInfusion coalRecipe; + public static RecipeManaInfusion snowballRecipe; + public static RecipeManaInfusion netherrackRecipe; + public static RecipeManaInfusion soulSandRecipe; + public static RecipeManaInfusion gravelRecipe; + + public static void init() { + redstoneRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Items.redstone, 2), new ItemStack(Items.redstone), 5000); + glowstoneRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Items.glowstone_dust, 2), new ItemStack(Items.glowstone_dust), 5000); + quartzRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Items.quartz, 2), new ItemStack(Items.quartz), 2500); + coalRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Items.coal, 2), new ItemStack(Items.coal), 2100); + snowballRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Items.snowball, 2), new ItemStack(Items.snowball), 200); + netherrackRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.netherrack, 2), new ItemStack(Blocks.netherrack), 200); + soulSandRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.soul_sand, 2), new ItemStack(Blocks.soul_sand), 1500); + gravelRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.gravel, 2), new ItemStack(Blocks.gravel), 720); + } + +} diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index ca4068d48..dfe88b7f4 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -22,6 +22,7 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.crafting.ModCrafingRecipes; import vazkii.botania.common.crafting.ModElvenTradeRecipes; import vazkii.botania.common.crafting.ModManaAlchemyRecipes; +import vazkii.botania.common.crafting.ModManaConjurationRecipes; import vazkii.botania.common.crafting.ModManaInfusionRecipes; import vazkii.botania.common.crafting.ModPetalRecipes; import vazkii.botania.common.crafting.ModRuneRecipes; @@ -130,6 +131,7 @@ public final class LexiconData { public static LexiconEntry waterRod; public static LexiconEntry elfGear; public static LexiconEntry openBucket; + public static LexiconEntry conjurationCatalyst; public static LexiconEntry baublesIntro; public static LexiconEntry tinyPlanet; @@ -381,6 +383,10 @@ public final class LexiconData { platform = new BLexiconEntry(LibLexicon.DEVICE_PLATFORM, categoryDevices); platform.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipePlatform)); + conjurationCatalyst = new ALexiconEntry(LibLexicon.DEVICE_MANA_CONJURATION, categoryDevices); + conjurationCatalyst.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeConjurationCatalyst), new PageManaInfusionRecipe("2", ModManaConjurationRecipes.redstoneRecipe), new PageManaInfusionRecipe("3", ModManaConjurationRecipes.glowstoneRecipe), new PageManaInfusionRecipe("4", ModManaConjurationRecipes.quartzRecipe), + new PageManaInfusionRecipe("5", ModManaConjurationRecipes.coalRecipe), new PageManaInfusionRecipe("6", ModManaConjurationRecipes.snowballRecipe), new PageManaInfusionRecipe("7", ModManaConjurationRecipes.netherrackRecipe), new PageManaInfusionRecipe("8", ModManaConjurationRecipes.soulSandRecipe), new PageManaInfusionRecipe("9", ModManaConjurationRecipes.gravelRecipe)); + // 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 ffd74a1c4..f48bab191 100644 --- a/MODSRC/vazkii/botania/common/lib/LibLexicon.java +++ b/MODSRC/vazkii/botania/common/lib/LibLexicon.java @@ -94,6 +94,7 @@ public final class LibLexicon { public static final String DEVICE_FOREST_EYE = "forestEye"; public static final String DEVICE_FOREST_DRUM = "forestDrum"; public static final String DEVICE_PLATFORM = "platform"; + public static final String DEVICE_MANA_CONJURATION = "manaConjuration"; public static final String TOOL_MANA_BLASTER = "manaBlaster"; public static final String TOOL_GRASS_SEEDS = "grassSeeds";