diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPFlower.java b/src/main/java/biomesoplenty/common/block/BlockBOPFlower.java index bcc44ab01..d72199209 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPFlower.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPFlower.java @@ -36,6 +36,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import biomesoplenty.api.block.BOPPlant; import biomesoplenty.api.block.IBOPVariant; +import biomesoplenty.common.block.BlockBOPMushroom.MushroomType; import biomesoplenty.common.util.inventory.CreativeTabBOP; public class BlockBOPFlower extends BOPPlant @@ -47,7 +48,27 @@ public class BlockBOPFlower extends BOPPlant super(VARIANT_PROP); } - //TODO: Add light for glowflowers, enderlotus and the burning blossom (Requires Forge) + @Override + public int getLightValue(IBlockAccess world, BlockPos pos) + { + IBlockState state = world.getBlockState(pos); + FlowerType type = (FlowerType)state.getValue(VARIANT_PROP); + + switch (type) + { + case GLOWFLOWER: + return 9; + + case ENDERLOTUS: + return 5; + + case BURNING_BLOSSOM: + return 9; + + default: + return super.getLightValue(); + } + } //TODO: Make enderlotus require spectral moss //TODO: Make bromeliads require hard dirt, hardened clay or sand diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPLog.java b/src/main/java/biomesoplenty/common/block/BlockBOPLog.java index 8e529647e..14a5063bc 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPLog.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPLog.java @@ -24,7 +24,13 @@ public class BlockBOPLog extends BlockBOPLogBase { super(VARIANT_PROP); } - + + @Override + public int damageDropped(IBlockState state) + { + return this.getMetaFromState(this.getDefaultState().withProperty(VARIANT_PROP, state.getValue(VARIANT_PROP))); + } + @Override public IBlockState getStateFromMeta(int meta) { @@ -77,7 +83,7 @@ public class BlockBOPLog extends BlockBOPLogBase @Override public int getDefaultMetadata() { - return this.ordinal() * 3; + return this.ordinal() * 3 + 1; } } } diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPLog2.java b/src/main/java/biomesoplenty/common/block/BlockBOPLog2.java index 8aaa12fb8..0b81d7fbe 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPLog2.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPLog2.java @@ -24,6 +24,12 @@ public class BlockBOPLog2 extends BlockBOPLogBase super(VARIANT_PROP); } + @Override + public int damageDropped(IBlockState state) + { + return this.getMetaFromState(this.getDefaultState().withProperty(VARIANT_PROP, state.getValue(VARIANT_PROP))); + } + @Override public IBlockState getStateFromMeta(int meta) { @@ -76,7 +82,7 @@ public class BlockBOPLog2 extends BlockBOPLogBase @Override public int getDefaultMetadata() { - return this.ordinal() * 3; + return this.ordinal() * 3 + 1; } } } diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPLog3.java b/src/main/java/biomesoplenty/common/block/BlockBOPLog3.java index 9ef8cd9c2..91d568c16 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPLog3.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPLog3.java @@ -24,6 +24,12 @@ public class BlockBOPLog3 extends BlockBOPLogBase super(VARIANT_PROP); } + @Override + public int damageDropped(IBlockState state) + { + return this.getMetaFromState(this.getDefaultState().withProperty(VARIANT_PROP, state.getValue(VARIANT_PROP))); + } + @Override public IBlockState getStateFromMeta(int meta) { @@ -76,7 +82,7 @@ public class BlockBOPLog3 extends BlockBOPLogBase @Override public int getDefaultMetadata() { - return this.ordinal() * 3; + return this.ordinal() * 3 + 1; } } } diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPLog4.java b/src/main/java/biomesoplenty/common/block/BlockBOPLog4.java index e92e98c05..f58d38b3e 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPLog4.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPLog4.java @@ -23,6 +23,12 @@ public class BlockBOPLog4 extends BlockBOPLogBase { super(VARIANT_PROP); } + + @Override + public int damageDropped(IBlockState state) + { + return this.getMetaFromState(this.getDefaultState().withProperty(VARIANT_PROP, state.getValue(VARIANT_PROP))); + } @Override public IBlockState getStateFromMeta(int meta) @@ -72,7 +78,7 @@ public class BlockBOPLog4 extends BlockBOPLogBase @Override public int getDefaultMetadata() { - return this.ordinal() * 3; + return this.ordinal() * 3 + 1; } } } diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPLogBase.java b/src/main/java/biomesoplenty/common/block/BlockBOPLogBase.java index 022e8ca93..c6f191d1a 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPLogBase.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPLogBase.java @@ -19,7 +19,6 @@ import net.minecraft.world.World; import biomesoplenty.api.block.BOPBlock; import biomesoplenty.common.util.inventory.CreativeTabBOP; -//TODO: Commented methods and calls public abstract class BlockBOPLogBase extends BOPBlock { public static final PropertyEnum AXIS_PROP = PropertyEnum.create("axis", EnumFacing.Axis.class); @@ -30,7 +29,7 @@ public abstract class BlockBOPLogBase extends BOPBlock this.setDefaultState(this.getDefaultState().withProperty(AXIS_PROP, EnumFacing.Axis.Y)); - //this.setHarvestLevel("axe", 0); + this.setHarvestLevel("axe", 0); this.setHardness(2.0F); this.setResistance(5.0F); diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPMushroom.java b/src/main/java/biomesoplenty/common/block/BlockBOPMushroom.java index 6239dcd60..d872e5a8d 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPMushroom.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPMushroom.java @@ -29,7 +29,18 @@ public class BlockBOPMushroom extends BOPPlant super(VARIANT_PROP); } - //TODO: Add light for glowshrooms (Requires Forge) + @Override + public int getLightValue(IBlockAccess world, BlockPos pos) + { + IBlockState blockState = world.getBlockState(pos); + + if ((MushroomType)blockState.getValue(VARIANT_PROP) == MushroomType.GLOWSHROOM) + { + return 6; + } + + return super.getLightValue(); + } @Override public boolean canBlockStay(World world, BlockPos pos, IBlockState state)