diff --git a/MODSRC/vazkii/botania/common/block/BlockDistributor.java b/MODSRC/vazkii/botania/common/block/BlockDistributor.java index 8d4bebc0f..93ea22218 100644 --- a/MODSRC/vazkii/botania/common/block/BlockDistributor.java +++ b/MODSRC/vazkii/botania/common/block/BlockDistributor.java @@ -13,16 +13,21 @@ package vazkii.botania.common.block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; +import vazkii.botania.api.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.TileDistributor; +import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockIDs; import vazkii.botania.common.lib.LibBlockNames; -public class BlockDistributor extends BlockModContainer { +public class BlockDistributor extends BlockModContainer implements ILexiconable { Icon iconSide, iconTop; @@ -50,4 +55,9 @@ public class BlockDistributor extends BlockModContainer { return new TileDistributor(); } + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.distributor; + } + } diff --git a/MODSRC/vazkii/botania/common/block/BlockLivingrock.java b/MODSRC/vazkii/botania/common/block/BlockLivingrock.java index 10293fbfd..7941f232b 100644 --- a/MODSRC/vazkii/botania/common/block/BlockLivingrock.java +++ b/MODSRC/vazkii/botania/common/block/BlockLivingrock.java @@ -17,15 +17,20 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; +import net.minecraft.world.World; +import vazkii.botania.api.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.helper.IconHelper; 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 BlockLivingrock extends BlockMod { +public class BlockLivingrock extends BlockMod implements ILexiconable { private static final int TYPES = 5; Icon[] icons; @@ -67,4 +72,9 @@ public class BlockLivingrock extends BlockMod { return icons[Math.min(TYPES - 1, par2)]; } + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.pureDaisy; + } + } diff --git a/MODSRC/vazkii/botania/common/block/BlockLivingwood.java b/MODSRC/vazkii/botania/common/block/BlockLivingwood.java index 6f8cab456..3171b4a60 100644 --- a/MODSRC/vazkii/botania/common/block/BlockLivingwood.java +++ b/MODSRC/vazkii/botania/common/block/BlockLivingwood.java @@ -18,14 +18,19 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; +import net.minecraft.world.World; +import vazkii.botania.api.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.helper.IconHelper; 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; -public class BlockLivingwood extends BlockMod { +public class BlockLivingwood extends BlockMod implements ILexiconable { private static final int TYPES = 5; Icon[] icons; @@ -65,5 +70,10 @@ public class BlockLivingwood extends BlockMod { public Icon getIcon(int par1, int par2) { return icons[Math.min(TYPES - 1, par2)]; } + + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.pureDaisy; + } } diff --git a/MODSRC/vazkii/botania/common/block/BlockPylon.java b/MODSRC/vazkii/botania/common/block/BlockPylon.java index 95c582f0b..2d51ae926 100644 --- a/MODSRC/vazkii/botania/common/block/BlockPylon.java +++ b/MODSRC/vazkii/botania/common/block/BlockPylon.java @@ -13,15 +13,20 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; +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.lexicon.LexiconEntry; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TilePylon; +import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockIDs; import vazkii.botania.common.lib.LibBlockNames; -public class BlockPylon extends BlockModContainer { +public class BlockPylon extends BlockModContainer implements ILexiconable { public BlockPylon() { super(LibBlockIDs.idPylon, Material.iron); @@ -30,7 +35,7 @@ public class BlockPylon extends BlockModContainer { setUnlocalizedName(LibBlockNames.PYLON); float f = 1F / 16F * 2F; - setBlockBounds(f, 0F, f, 1F - f, 1F / 16F * 20F, 1F - f); + setBlockBounds(f, 0F, f, 1F - f, 1F / 16F * 21F, 1F - f); } @Override @@ -62,4 +67,9 @@ public class BlockPylon extends BlockModContainer { public TileEntity createNewTileEntity(World world) { return new TilePylon(); } + + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.pylon; + } }