From f1a15963233a2f33080d94bb9331fd943182b992 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Fri, 14 Feb 2014 21:23:47 +0000 Subject: [PATCH] Add ILexiconable implementation to a bunch of things. --- MODSRC/vazkii/botania/common/block/BlockPool.java | 10 +++++++++- .../vazkii/botania/common/block/BlockRuneAltar.java | 10 +++++++++- MODSRC/vazkii/botania/common/block/BlockUnstable.java | 11 ++++++++++- .../block/subtile/functional/SubTileBellethorn.java | 7 +++++++ .../block/subtile/generating/SubTileDaybloom.java | 8 ++++++++ 5 files changed, 43 insertions(+), 3 deletions(-) diff --git a/MODSRC/vazkii/botania/common/block/BlockPool.java b/MODSRC/vazkii/botania/common/block/BlockPool.java index 414e379b9..b277a986f 100644 --- a/MODSRC/vazkii/botania/common/block/BlockPool.java +++ b/MODSRC/vazkii/botania/common/block/BlockPool.java @@ -21,15 +21,18 @@ 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.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TilePool; +import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockIDs; import vazkii.botania.common.lib.LibBlockNames; import cpw.mods.fml.common.network.PacketDispatcher; -public class BlockPool extends BlockModContainer implements IWandHUD, IWandable { +public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, ILexiconable { protected BlockPool() { super(LibBlockIDs.idPool, Material.rock); @@ -84,4 +87,9 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable ((TilePool) world.getBlockTileEntity(x, y, z)).onWanded(player, stack); return true; } + + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.pool; + } } diff --git a/MODSRC/vazkii/botania/common/block/BlockRuneAltar.java b/MODSRC/vazkii/botania/common/block/BlockRuneAltar.java index edd72609d..96728707d 100644 --- a/MODSRC/vazkii/botania/common/block/BlockRuneAltar.java +++ b/MODSRC/vazkii/botania/common/block/BlockRuneAltar.java @@ -22,14 +22,17 @@ 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.TileRuneAltar; import vazkii.botania.common.block.tile.TileSimpleInventory; +import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockIDs; import vazkii.botania.common.lib.LibBlockNames; -public class BlockRuneAltar extends BlockModContainer implements IWandable { +public class BlockRuneAltar extends BlockModContainer implements IWandable, ILexiconable { Random random; Icon[] icons; @@ -125,4 +128,9 @@ public class BlockRuneAltar extends BlockModContainer implements IWandable { return true; } + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.runicAltar; + } + } diff --git a/MODSRC/vazkii/botania/common/block/BlockUnstable.java b/MODSRC/vazkii/botania/common/block/BlockUnstable.java index bb4e4b736..1f5cb5758 100644 --- a/MODSRC/vazkii/botania/common/block/BlockUnstable.java +++ b/MODSRC/vazkii/botania/common/block/BlockUnstable.java @@ -19,17 +19,21 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.passive.EntitySheep; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import vazkii.botania.api.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; +import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockIDs; import vazkii.botania.common.lib.LibBlockNames; import cpw.mods.fml.common.registry.GameRegistry; -public class BlockUnstable extends BlockMod { +public class BlockUnstable extends BlockMod implements ILexiconable { public BlockUnstable() { super(LibBlockIDs.idUnstableBlock, Material.iron); @@ -95,4 +99,9 @@ public class BlockUnstable extends BlockMod { return getRenderColor(par1iBlockAccess.getBlockMetadata(par2, par3, par4)); } + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.unstableBlocks; + } + } diff --git a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java index 16d2571fe..451cebbfd 100644 --- a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java +++ b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java @@ -17,7 +17,9 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; +import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.subtile.SubTileFunctional; +import vazkii.botania.common.lexicon.LexiconData; public class SubTileBellethorn extends SubTileFunctional { @@ -51,5 +53,10 @@ public class SubTileBellethorn extends SubTileFunctional { } } } + + @Override + public LexiconEntry getEntry() { + return LexiconData.bellethorne; + } } diff --git a/MODSRC/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java b/MODSRC/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java index ef2c626b1..e515edfeb 100644 --- a/MODSRC/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java +++ b/MODSRC/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java @@ -11,7 +11,10 @@ */ package vazkii.botania.common.block.subtile.generating; +import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.subtile.SubTileGenerating; +import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibLexicon; public class SubTileDaybloom extends SubTileGenerating { @@ -19,5 +22,10 @@ public class SubTileDaybloom extends SubTileGenerating { public int getColor() { return 0xFFFF00; } + + @Override + public LexiconEntry getEntry() { + return LexiconData.daybloom; + } }