From cc14ee9f8972aee768a7a9cd9a114ec62608ee63 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sun, 30 Mar 2014 15:21:41 +0100 Subject: [PATCH] Recipe/docs for the fertilizer. --- .../botania/common/crafting/ModCrafingRecipes.java | 11 ++++++++++- MODSRC/vazkii/botania/common/item/ItemFertilizer.java | 3 +-- .../botania/common/item/ItemPestleAndMortar.java | 6 ++++++ MODSRC/vazkii/botania/common/lexicon/LexiconData.java | 3 ++- resources/assets/botania/lang/en_US.lang | 7 +++++-- 5 files changed, 24 insertions(+), 6 deletions(-) diff --git a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java index fbf287ded..1ec6b24ab 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java @@ -13,6 +13,7 @@ package vazkii.botania.common.crafting; import java.util.List; +import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -74,7 +75,9 @@ public final class ModCrafingRecipes { public static IRecipe recipeManaDetector; public static IRecipe recipeManaBlaster; public static IRecipe recipeTurntable; - + public static IRecipe recipeFertilizerPowder; + public static IRecipe recipeFerilizerDye; + public static void init() { // Lexicon Recipe addShapelessOreDictRecipe(new ItemStack(ModItems.lexicon), "treeSapling", Items.book); @@ -313,6 +316,12 @@ public final class ModCrafingRecipes { 'W', LibOreDict.LIVING_WOOD, 'P', Blocks.sticky_piston); recipeTurntable = BotaniaAPI.getLatestAddedRecipe(); + + // Fertilizer Recipes + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.fertilizer), new ItemStack(Items.dye, 1, 15), new ItemStack(ModItems.dye, 1, -1), new ItemStack(ModItems.dye, 1, -1), new ItemStack(ModItems.dye, 1, -1), new ItemStack(ModItems.dye, 1, -1)); + recipeFertilizerPowder = BotaniaAPI.getLatestAddedRecipe(); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.fertilizer), new ItemStack(Items.dye, 1, 15), new ItemStack(Items.dye, 1, 11), new ItemStack(Items.dye, 1, 11), new ItemStack(Items.dye, 1, 1), new ItemStack(Items.dye, 1, 1)); + recipeFerilizerDye = BotaniaAPI.getLatestAddedRecipe(); } private static void addOreDictRecipe(ItemStack output, Object... recipe) { diff --git a/MODSRC/vazkii/botania/common/item/ItemFertilizer.java b/MODSRC/vazkii/botania/common/item/ItemFertilizer.java index b8a42eb2b..d7c159c3d 100644 --- a/MODSRC/vazkii/botania/common/item/ItemFertilizer.java +++ b/MODSRC/vazkii/botania/common/item/ItemFertilizer.java @@ -38,7 +38,7 @@ public class ItemFertilizer extends ItemMod { for(int i = -range; i < (range + 1); i++) for(int j = -range; j < (range + 1); j++) { - for(int k = 2; k >= 0; k--) { + for(int k = 2; k >= -2; k--) { int x = par4 + i + 1; int y = par5 + k + 1; int z = par6 + j + 1; @@ -68,5 +68,4 @@ public class ItemFertilizer extends ItemMod { return true; } - } diff --git a/MODSRC/vazkii/botania/common/item/ItemPestleAndMortar.java b/MODSRC/vazkii/botania/common/item/ItemPestleAndMortar.java index 7577b6fc4..f27e49a6a 100644 --- a/MODSRC/vazkii/botania/common/item/ItemPestleAndMortar.java +++ b/MODSRC/vazkii/botania/common/item/ItemPestleAndMortar.java @@ -11,6 +11,7 @@ */ package vazkii.botania.common.item; +import net.minecraft.item.ItemStack; import vazkii.botania.common.lib.LibItemNames; public class ItemPestleAndMortar extends ItemMod { @@ -21,5 +22,10 @@ public class ItemPestleAndMortar extends ItemMod { setContainerItem(this); setUnlocalizedName(LibItemNames.PESTLE_AND_MORTAR); } + + @Override + public boolean doesContainerItemLeaveCraftingGrid(ItemStack par1ItemStack) { + return false; + } } diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index 58948d8f1..da18b0e9e 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -107,7 +107,8 @@ public final class LexiconData { // BASICS ENTRIES flowers = new BLexiconEntry(LibLexicon.BASICS_FLOWERS, categoryBasics); - flowers.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_FLOWERS), new PageText("2"), new PageCraftingRecipe("3", ModCrafingRecipes.recipesPetals), new PageCraftingRecipe("4", ModCrafingRecipes.recipePestleAndMortar), new PageCraftingRecipe("5", ModCrafingRecipes.recipesDyes)); + flowers.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_FLOWERS), new PageText("2"), new PageCraftingRecipe("3", ModCrafingRecipes.recipesPetals), new PageCraftingRecipe("4", ModCrafingRecipes.recipePestleAndMortar), new PageCraftingRecipe("5", ModCrafingRecipes.recipesDyes), + new PageText("6"), new PageCraftingRecipe("7", ModCrafingRecipes.recipeFertilizerPowder), new PageCraftingRecipe("8", ModCrafingRecipes.recipeFerilizerDye)); apothecary = new BLexiconEntry(LibLexicon.BASICS_APOTHECARY, categoryBasics); apothecary.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_APOTHECARY), new PageText("2"), new PageText("3"), new PageCraftingRecipe("4", ModCrafingRecipes.recipesApothecary)); diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 293ad90f6..de78e6832 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -275,12 +275,15 @@ botania.page.lexicon1=Crafting the &1Lexica Botania&0. # -- MYSTICAL FLOWERS botania.entry.flowers=Mystical Flowers -botania.page.flowers0=Around the world, you may stumble upon a large variety of Mystical Flora. Spotting these doesn't take much work as the flowers themselves emit a fair amount of shine.
They come in a total of &416 &0different colors.
It's also possible to grow these flowers using &1Bone Meal&0. +botania.page.flowers0=Around the world, you may stumble upon a large variety of Mystical Flora. Spotting these doesn't take much work as the flowers themselves emit a fair amount of shine.
They come in a total of &416 &0different colors.
It's also possible to grow these flowers using &1Floral Fertlizer&0 (read on). botania.page.flowers1=Flowers as far as the eye can see... -botania.page.flowers2=These flowers can be plucked for &1Mystical Petals&0, that can be used for making magical instruments and plants alike.
These petals can also be crushed into &1Floral Power&0, by the use of a &1Pestle and Mortar&0, which functions much alike any mundane piece of dye. +botania.page.flowers2=These flowers can be plucked for &1Mystical Petals&0, that can be used for making magical instruments and plants alike.
These petals can also be crushed into &1Floral Powder&0, by the use of a &1Pestle and Mortar&0, which functions much alike any mundane piece of dye. botania.page.flowers3=Plucking Petals off Flowers. botania.page.flowers4=Crafting the &1Pestle and Mortar&0. botania.page.flowers5=Grinding Petals into Powder. +botania.page.flowers6=By mixing the &1Floral Powder&0 with some &1Bone Meal&0, it's possible to create a different type of fertilizer. The &1Floral Fertlizer&0 will grow a small amount of &1Mystical Flowers&0 in the nearby vacinity, if you ever run low on them. +botania.page.flowers7=Making fertilizer (any powder colors work) +botania.page.flowers8=Using typical flower substances also works # -- PETAL APOTHECARY botania.entry.apothecary=Petal Apothecary