From 258655bc9102db84ac9aaa980be78049199c6fb6 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Fri, 28 Aug 2015 19:56:35 +0100 Subject: [PATCH] Recipe/docs for the Manatide Bellows. --- .../botania/common/block/mana/BlockBellows.java | 10 +++++++++- .../botania/common/crafting/ModCraftingRecipes.java | 11 ++++++++++- .../vazkii/botania/common/lexicon/LexiconData.java | 5 ++++- .../java/vazkii/botania/common/lib/LibLexicon.java | 1 + src/main/resources/assets/botania/lang/en_US.lang | 6 ++++++ 5 files changed, 30 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java index 95ae0d08e..8980e2992 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -19,14 +19,17 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TileBellows; import vazkii.botania.common.entity.EntityDoppleganger; +import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockBellows extends BlockModContainer { +public class BlockBellows extends BlockModContainer implements ILexiconable { private static final int[] META_ROTATIONS = new int[] { 3, 4, 2, 5 }; @@ -83,4 +86,9 @@ public class BlockBellows extends BlockModContainer { return new TileBellows(); } + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.bellows; + } + } diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 47f196225..4f0134800 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -281,7 +281,8 @@ public final class ModCraftingRecipes { public static IRecipe recipeGreaterMagnetRing; public static IRecipe recipeFireChakram; public static IRecipe recipeThunderSword; - + public static IRecipe recipeBellows; + // Garden of Glass public static IRecipe recipeRootToSapling; public static IRecipe recipeRootToFertilizer; @@ -1925,6 +1926,14 @@ public final class ModCraftingRecipes { 'T', new ItemStack(ModItems.terraSword)); recipeThunderSword = BotaniaAPI.getLatestAddedRecipe(); + // Manatide Bellows Recipe + addOreDictRecipe(new ItemStack(ModBlocks.bellows), + "SSS", "RL ", "SSS", + 'S', new ItemStack(ModFluffBlocks.livingwoodSlab), + 'R', LibOreDict.RUNE[3], + 'L', new ItemStack(Items.leather)); + recipeBellows = BotaniaAPI.getLatestAddedRecipe(); + /////////////////////////////////////////////////////////////////////////////////////////////////////////// // Storage Block/Nugget Recipes diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index b2ae5decb..883a0b0da 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -92,6 +92,7 @@ public final class LexiconData { public static LexiconEntry prism; public static LexiconEntry poolCart; public static LexiconEntry sparkChanger; + public static LexiconEntry bellows; public static LexiconEntry functionalIntro; public static LexiconEntry flowerShrinking; @@ -429,6 +430,9 @@ public final class LexiconData { sparkChanger = new ALexiconEntry(LibLexicon.MANA_SPARK_CHANGER, categoryMana); sparkChanger.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeSparkChanger)); + bellows = new BLexiconEntry(LibLexicon.MANA_BELLOWS, categoryMana); + bellows.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeBellows)); + // FUNCTIONAL FLOWERS ENTRIES functionalIntro = new BLexiconEntry(LibLexicon.FFLOWER_INTRO, categoryFunctionalFlowers); functionalIntro.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3"), new PageCraftingRecipe("4", ModCraftingRecipes.recipeRedstoneRoot)).setIcon(null);; @@ -864,7 +868,6 @@ public final class LexiconData { knockbacklBelt.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeKnocbackBelt)); icePendant = new BLexiconEntry(LibLexicon.BAUBLE_ICE_PENDANT, categoryBaubles); - icePendant.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeIcePendant)); lavaPendant = new BLexiconEntry(LibLexicon.BAUBLE_LAVA_PENDANT, categoryBaubles); lavaPendant.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeFirePendant)); diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index ae37cee75..3f4554c14 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -61,6 +61,7 @@ public final class LibLexicon { public static final String MANA_PRISM = "prism"; public static final String MANA_POOL_CART = "poolCart"; public static final String MANA_SPARK_CHANGER = "sparkChanger"; + public static final String MANA_BELLOWS = "bellows"; public static final String FFLOWER_INTRO = "fIntro"; public static final String FFLOWER_SHRINKING = "flowerShrinking"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 3bfcfaef3..913563b0b 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -2057,6 +2057,12 @@ botania.page.sparkChanger0=The &1Spark Tinkerer&0 is a block with the ability to botania.page.sparkChanger1=When the &1Spark Tinkerer&0 gets a redstone signal it'll randomly pick a &1Spark&0, between all of those it's connected to that have a different augment from the one stored in it, and swap the augment in that &1Spark&0 with the one stored in the block.
The stored augment can be withdrawn or deposited with &1Hoppers&0 or other automation methods. botania.page.sparkChanger2=Hahahaha, water fire... +# -- MANATIDE BELLOWS +botania.entry.bellows=Manatide Bellows +botania.page.bellows0=&1Manatide Bellows&0 are a simple device with the purpose of increasing the speed &1Mana Pools&0 output transfer rate.
Placing these bellows next to, and pointing towards, a &1Mana Pool&0 will increase the speed at which the pool outputs its &4Mana&0 into &1Mana Tablets&0 or other items. Multiple bellows will work at increasing further the transfer rate. +botania.page.bellows1=A slightly less interesting ability of the &1Manatide Bellows&0 is to stoke a &1Furnace&0's flames.
&1Manatide Bellows&0 can be utilized manually via a right click. Pointing the bellows towards an active &1Furnace&0 and manning them will increase the speed and efficiency at which the items in the &1Furnace&0 get smelted. +botania.page.bellows2=It is your duty to be stoked + # - FUNCTIONAL FLOWERS # -- AN INTRODUCTION TO FUNCTION botania.entry.fIntro=An Introduction to Function