From d58a7c365ee69a8afbc16c7de8698dd9849cd433 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sat, 30 Aug 2014 16:19:30 +0100 Subject: [PATCH] Recipe/docs for the Mana Fluxfield. Coming along. --- MODSRC/vazkii/botania/common/block/BlockRFGenerator.java | 8 +++++++- .../botania/common/crafting/ModCrafingRecipes.java | 9 +++++++++ MODSRC/vazkii/botania/common/lexicon/LexiconData.java | 4 ++++ MODSRC/vazkii/botania/common/lib/LibLexicon.java | 1 + resources/assets/botania/lang/en_US.lang | 5 +++++ 5 files changed, 26 insertions(+), 1 deletion(-) diff --git a/MODSRC/vazkii/botania/common/block/BlockRFGenerator.java b/MODSRC/vazkii/botania/common/block/BlockRFGenerator.java index a4ad84687..127dbb2d2 100644 --- a/MODSRC/vazkii/botania/common/block/BlockRFGenerator.java +++ b/MODSRC/vazkii/botania/common/block/BlockRFGenerator.java @@ -20,6 +20,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.mana.TileDistributor; @@ -27,7 +28,7 @@ import vazkii.botania.common.block.tile.mana.TileRFGenerator; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockRFGenerator extends BlockModContainer { +public class BlockRFGenerator extends BlockModContainer implements ILexiconable { protected BlockRFGenerator() { super(Material.rock); @@ -50,4 +51,9 @@ public class BlockRFGenerator extends BlockModContainer { return new TileRFGenerator(); } + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.rfGenerator; + } + } diff --git a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java index b9dcf0ffe..62513c24e 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java @@ -192,6 +192,7 @@ public final class ModCrafingRecipes { public static IRecipe recipeLeafHorn; public static IRecipe recipeDiviningRod; public static List recipesWings; + public static IRecipe recipeRFGenerator; public static void init() { // Lexicon Recipe @@ -1208,6 +1209,14 @@ public final class ModCrafingRecipes { GameRegistry.addShapelessRecipe(new ItemStack(ModItems.flightTiara, 1, 2 + i), new ItemStack(ModItems.flightTiara), new ItemStack(ModItems.quartz, 1, i)); recipesWings = BotaniaAPI.getLatestAddedRecipes(7); + // Mana Fluxfield Recipe + addOreDictRecipe(new ItemStack(ModBlocks.rfGenerator), + "SRS", "RMR", "SRS", + 'S', LibOreDict.LIVING_ROCK, + 'M', LibOreDict.MANA_STEEL, + 'R', new ItemStack(Blocks.redstone_block)); + recipeRFGenerator = BotaniaAPI.getLatestAddedRecipe(); + // Mana and Terrasteel Block Recipes addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0), "III", "III", "III", diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index 491203ccf..9ea9b2658 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -73,6 +73,7 @@ public final class LexiconData { public static LexiconEntry paintLens; public static LexiconEntry sparks; public static LexiconEntry sparkUpgrades; + public static LexiconEntry rfGenerator; public static LexiconEntry functionalIntro; public static LexiconEntry jadedAmaranthus; @@ -241,6 +242,9 @@ public final class LexiconData { sparkUpgrades = new ALexiconEntry(LibLexicon.MANA_SPARK_UPGRADES, categoryMana); sparkUpgrades.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3"), new PageText("4"), new PageCraftingRecipe("5", ModCrafingRecipes.recipesSparkUpgrades)); + rfGenerator = new BLexiconEntry(LibLexicon.MANA_RF_GENERATOR, categoryMana); + rfGenerator.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeRFGenerator)); + lenses = new BLexiconEntry(LibLexicon.MANA_LENSES, categoryMana); lenses.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeManaLens), new PageCraftingRecipe("2", ModCrafingRecipes.recipesLensDying), new PageCraftingRecipe("3", ModCrafingRecipes.recipeRainbowLens), new PageText("4"), new PageText("5"), new PageText("6"), new PageCraftingRecipe("7", ModCrafingRecipes.recipeLensVelocity), diff --git a/MODSRC/vazkii/botania/common/lib/LibLexicon.java b/MODSRC/vazkii/botania/common/lib/LibLexicon.java index 727594592..4e493d55a 100644 --- a/MODSRC/vazkii/botania/common/lib/LibLexicon.java +++ b/MODSRC/vazkii/botania/common/lib/LibLexicon.java @@ -39,6 +39,7 @@ public final class LibLexicon { public static final String MANA_DISTRIBUTOR = "distributor"; public static final String MANA_LENSES = "lens"; public static final String MANA_VOID = "manaVoid"; + public static final String MANA_RF_GENERATOR = "rfGenerator"; public static final String MANA_TRANSPORT = "manaTransport"; public static final String MANA_DETECTOR = "manaDetector"; public static final String MANA_COMPOSITE_LENS = "compositeLens"; diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 168a8ab24..f1329c2b0 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -853,6 +853,11 @@ botania.entry.manaVoid=Mana Void botania.page.manaVoid0=The &1Mana Void&0 is, in layman's terms, the grave for &4Mana&0. Any &4Mana&0 shot into this block will simply vanish into the void, never to be seen again.
Placing one of these under a &1Mana Pool&0 allows the pool to always accept &4Mana&0, but disposing any it can't hold. botania.page.manaVoid1=Crafting the void block +# -- MANA FLUXFIELD +botania.entry.rfGenerator=Mana Fluxfield +botania.page.rfGenerator0=By passing &4Mana&0 through a field of redstone energy, its state can change from a natural energy source to &4Redstone Flux&0.
Simply pointing a spreader at this block will have it shoot at it, converting the &4Mana&0 that lands on it into &4RF&0. It can then be pulled out with any &4RF&0 transporter. +botania.page.rfGenerator1=The bullet guys. I bit it. + # -- MANA LENSES botania.entry.lens=Mana Lenses botania.page.lens0=In order to upgrade the potential a &1Mana Spreader&0, one can apply &1Mana Lenses&0. The very basic mana lens does absolutely nothing.
Lenses can be &4dyed&0 all the 16 colors of the spectrum, or combined with a &1Mana Pearl&0 to create a &1Rainbow Lens&0. These will change the color of the burst.