diff --git a/MODSRC/vazkii/botania/common/block/BlockEnchanter.java b/MODSRC/vazkii/botania/common/block/BlockEnchanter.java index f07bca5d8..e324ea7a8 100644 --- a/MODSRC/vazkii/botania/common/block/BlockEnchanter.java +++ b/MODSRC/vazkii/botania/common/block/BlockEnchanter.java @@ -23,15 +23,18 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraft.world.World; +import vazkii.botania.api.ILexiconable; import vazkii.botania.api.IWandable; +import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.TileEnchanter; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockIDs; import vazkii.botania.common.lib.LibBlockNames; -public class BlockEnchanter extends BlockModContainer implements IWandable { +public class BlockEnchanter extends BlockModContainer implements IWandable, ILexiconable { Random random; public static Icon overlay; @@ -133,4 +136,9 @@ public class BlockEnchanter extends BlockModContainer implements IWandable { return true; } + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.manaEnchanting; + } + } diff --git a/MODSRC/vazkii/botania/common/block/BlockTurntable.java b/MODSRC/vazkii/botania/common/block/BlockTurntable.java index 442410336..2285b11dd 100644 --- a/MODSRC/vazkii/botania/common/block/BlockTurntable.java +++ b/MODSRC/vazkii/botania/common/block/BlockTurntable.java @@ -20,14 +20,17 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraft.world.World; +import vazkii.botania.api.ILexiconable; import vazkii.botania.api.IWandHUD; import vazkii.botania.api.IWandable; +import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.TileTurntable; +import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockIDs; import vazkii.botania.common.lib.LibBlockNames; -public class BlockTurntable extends BlockModContainer implements IWandable, IWandHUD { +public class BlockTurntable extends BlockModContainer implements IWandable, IWandHUD, ILexiconable { Icon[] icons; @@ -66,4 +69,9 @@ public class BlockTurntable extends BlockModContainer implements IWandable, IWan return true; } + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.turntable; + } + } diff --git a/MODSRC/vazkii/botania/common/block/subtile/generating/SubTileNightshade.java b/MODSRC/vazkii/botania/common/block/subtile/generating/SubTileNightshade.java index 779cce9d7..e6d297ad3 100644 --- a/MODSRC/vazkii/botania/common/block/subtile/generating/SubTileNightshade.java +++ b/MODSRC/vazkii/botania/common/block/subtile/generating/SubTileNightshade.java @@ -11,6 +11,9 @@ */ package vazkii.botania.common.block.subtile.generating; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.common.lexicon.LexiconData; + public class SubTileNightshade extends SubTileDaybloom { @Override @@ -28,5 +31,10 @@ public class SubTileNightshade extends SubTileDaybloom { public int getColor() { return 0x3D2A90; } + + @Override + public LexiconEntry getEntry() { + return LexiconData.nightshade; + } } diff --git a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java index e4cd53b9b..bac79f11e 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java @@ -70,6 +70,7 @@ public final class ModCrafingRecipes { public static List recipesManaTablet; public static IRecipe recipeManaDetector; public static IRecipe recipeManaBlaster; + public static IRecipe recipeTurntable; public static void init() { // Lexicon Recipe @@ -299,6 +300,13 @@ public final class ModCrafingRecipes { 'T', new ItemStack(Block.tnt), 'W', LibOreDict.LIVING_WOOD); recipeManaBlaster = BotaniaAPI.getLatestAddedRecipe(); + + // Spreader Turntable Recipe + addOreDictRecipe(new ItemStack(ModBlocks.turntable), + "WWW", "WPW", "WWW", + 'W', LibOreDict.LIVING_WOOD, + 'P', Block.pistonStickyBase); + recipeTurntable = BotaniaAPI.getLatestAddedRecipe(); } private static void addOreDictRecipe(ItemStack output, Object... recipe) { diff --git a/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java index 80d90ffd2..e1e8fc22f 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java @@ -26,6 +26,7 @@ public final class ModPetalRecipes { public static RecipePetals pureDaisyRecipe; public static RecipePetals daybloomRecipe; + public static RecipePetals nightshadeRecipe; public static RecipePetals endoflameRecipe; public static RecipePetals hydroangeasRecipe; public static RecipePetals thermalilyRecipe; @@ -41,6 +42,7 @@ public final class ModPetalRecipes { pureDaisyRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY), white, white, white, white); daybloomRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DAYBLOOM), yellow, yellow, orange, lightBlue); + nightshadeRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_NIGHTSHADE), black, black, purple, gray); endoflameRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ENDOFLAME), brown, red, redMana, brownMana, lightGray); hydroangeasRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_HYDROANGEAS), blueMana, blue, pink, lightBlue); thermalilyRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_THERMALILY), red, orangeMana, orange, runeEarth, runeFire); diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index 4505141f6..f0378048c 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -76,6 +76,7 @@ public final class LexiconData { public static LexiconEntry generatingIntro; public static LexiconEntry daybloom; + public static LexiconEntry nightshade; public static LexiconEntry endoflame; public static LexiconEntry hydroangeas; public static LexiconEntry thermalily; @@ -83,6 +84,7 @@ public final class LexiconData { public static LexiconEntry pistonRelay; public static LexiconEntry pylon; public static LexiconEntry manaEnchanting; + public static LexiconEntry turntable; public static LexiconEntry manaBlaster; @@ -205,6 +207,9 @@ public final class LexiconData { daybloom = new BLexiconEntry(LibLexicon.GFLOWER_DAYBLOOM, categoryGenerationFlowers); daybloom.setPriority().setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.daybloomRecipe)); + nightshade = new BLexiconEntry(LibLexicon.GFLOWER_NIGHTSHADE, categoryGenerationFlowers); + nightshade.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.nightshadeRecipe)); + endoflame = new BLexiconEntry(LibLexicon.GFLOWER_ENDOFLAME, categoryGenerationFlowers); endoflame.setLexiconPages(new PageText("0"), new PageText("1"), new PagePetalRecipe("2", ModPetalRecipes.endoflameRecipe)); @@ -226,6 +231,9 @@ public final class LexiconData { new PageImage("2", LibResources.ENTRY_ENCHANTER0), new PageImage("3", LibResources.ENTRY_ENCHANTER1), new PageImage("4", LibResources.ENTRY_ENCHANTER2), new PageImage("5", LibResources.ENTRY_ENCHANTER3), new PageText("6"), new PageText("7"), new PageText("8"), new PageText("9"), new PageText("10")); + turntable = new BLexiconEntry(LibLexicon.DEVICE_TURNTABLE, categoryDevices); + turntable.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeTurntable)); + // 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 fb40e5a2c..2f38dfb40 100644 --- a/MODSRC/vazkii/botania/common/lib/LibLexicon.java +++ b/MODSRC/vazkii/botania/common/lib/LibLexicon.java @@ -59,6 +59,7 @@ public final class LibLexicon { public static final String GFLOWER_INTRO = "gIntro"; public static final String GFLOWER_DAYBLOOM = "daybloom"; + public static final String GFLOWER_NIGHTSHADE = "nightshade"; public static final String GFLOWER_ENDOFLAME = "endoflame"; public static final String GFLOWER_HYDROANGEAS = "hydroangeas"; public static final String GFLOWER_THERMALILY = "thermalily"; @@ -66,6 +67,7 @@ public final class LibLexicon { public static final String DEVICE_PISTON_RELAY = "pistonRelay"; 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 TOOL_MANA_BLASTER = "manaBlaster"; diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index f7aa0aedb..bdad3e057 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -452,6 +452,11 @@ botania.entry.daybloom=Daybloom botania.page.daybloom0=The &1Daybloom&0 is the most basic and rudimentary &4Generating Flower&0. Simply put, it preforms a modified photosythesis process, in order to transform sunlight into &4Mana&0.
The process is rather slow, you think half a dozen to ten of these should get the job done, for now. botania.page.daybloom1=&oStarting up a brand new day&r. +# -- NIGHTSHADE +botania.entry.nightshade=Nightshade +botania.page.nightshade0=The &1Nightshade&0 is the dark counterpart of the &1Daybloom&0, as it generates &4Mana&0 passively in any situation the &1Daybloom&0 can not, albeit at half the speed. +botania.page.nightshade1=&oThe shadow of the day&r. + # -- ENDOFLAME botania.entry.endoflame=Endoflame botania.page.endoflame0=While the &1Daybloom&0 is all well and good, a botanist requires more effective means of generating &4Mana&0.
The &1Endoflame&0 does that exactly, it will absorb any combustible items or blocks dropped on the nearby vacinity (albeit only one at a time) and burn through them to passively generate mana while the fuel lasts. @@ -494,6 +499,11 @@ botania.page.manaEnchanting8=After the enchanting begins, the enchanter will req botania.page.manaEnchanting9=When enough &4Mana&0 is gathered, the enchanting process will finalize, and the enchantments will be applied to the item.
The amount of &4Mana&0 required depends on the rarity of the enchantments being applied, their level, and the total amount of enchantments. botania.page.manaEnchanting10=During the enchanting process, the item can not be removed, but it can after the process has been completed.
Note that if at any point, any component of the construct is removed, it'll revert to it's original &1Lapis Lazuli Block&0 form. +# -- SPREADER TURNTABLE +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 + # - MYSTICAL INSTRUMENTS # -- MANA BLASTER botania.entry.manaBlaster=Mana Blaster