From 04d5941c6bb9c10ef2060c6eb3cf23f111477c8f Mon Sep 17 00:00:00 2001 From: TheWhiteWolves Date: Mon, 15 Jun 2015 22:31:47 +0100 Subject: [PATCH] Add Canopy Drum functionality --- .../botania/common/block/mana/BlockForestDrum.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java index 98478d5e5..0544383d5 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -45,6 +45,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona IIcon iconBases, iconFaces; IIcon iconBasesA, iconFacesA; + IIcon iconBasesB, iconFacesB; public BlockForestDrum() { super(Material.wood); @@ -88,18 +89,21 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona iconFaces = IconHelper.forBlock(par1IconRegister, this, 1); iconBasesA = IconHelper.forBlock(par1IconRegister, this, 2); iconFacesA = IconHelper.forBlock(par1IconRegister, this, 3); + iconBasesB = IconHelper.forBlock(par1IconRegister, this, 4); + iconFacesB = IconHelper.forBlock(par1IconRegister, this, 5); } @Override public void getSubBlocks(Item item, CreativeTabs tab, List list) { - for(int i = 0; i < 2; i++) + for(int i = 0; i < 3; i++) list.add(new ItemStack(item, 1, i)); } @Override public IIcon getIcon(int side, int meta) { boolean animal = meta == 1; - return side < 2 ? animal ? iconBasesA : iconBases : animal ? iconFacesA : iconFaces; + boolean tree = meta == 2; + return side < 2 ? animal ? iconBasesA : tree ? iconBasesB : iconBases : animal ? iconFacesA : tree ? iconFacesB : iconFaces; } @Override @@ -109,6 +113,8 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona if(world.getBlockMetadata(x, y, z) == 0) ItemGrassHorn.breakGrass(world, 0, x, y, z); + else if(world.getBlockMetadata(x, y, z) == 2) + ItemGrassHorn.breakGrass(world, 1, x, y, z); else if(!world.isRemote) { int range = 10; List entities = world.getEntitiesWithinAABB(EntityLiving.class, AxisAlignedBB.getBoundingBox(x - range, y - range, z - range, x + range + 1, y + range + 1, z + range + 1));