etc/BiomesOPlenty
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove reliance on hard coded sapling values in leaf drop code

Browse source
This commit is contained in:
Cheeserolls 2015-05-23 00:02:50 +01:00
parent bf130cbe9c
commit 555e96af81
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/biomesoplenty/common/block/BlockBOPLeaves.java
View file

@ -11,7 +11,6 @@ package biomesoplenty.common.block;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
import biomesoplenty.api.block.BOPBlocks;
import biomesoplenty.api.block.IBOPBlock; import biomesoplenty.api.block.IBOPBlock;
import biomesoplenty.common.enums.BOPTrees; import biomesoplenty.common.enums.BOPTrees;
import biomesoplenty.common.item.ItemBOPBlock; import biomesoplenty.common.item.ItemBOPBlock;
@ -134,24 +133,19 @@ public class BlockBOPLeaves extends BlockLeaves implements IBOPBlock
return 20; return 20;
} }
// TODO: use some kind of mapping to saplings
@Override @Override
public Item getItemDropped(IBlockState state, Random rand, int fortune) public Item getItemDropped(IBlockState state, Random rand, int fortune)
{ {
BOPTrees treeType = ((BOPTrees) state.getValue(this.variantProperty)); BOPTrees treeType = ((BOPTrees) state.getValue(this.variantProperty));
int saplingPage = treeType.ordinal() / 8; return Item.getItemFromBlock( BlockBOPSapling.paging.getBlock(treeType) );
if (saplingPage == 2) {return Item.getItemFromBlock(BOPBlocks.sapling_2);}
if (saplingPage == 1) {return Item.getItemFromBlock(BOPBlocks.sapling_1);}
return Item.getItemFromBlock(BOPBlocks.sapling_0);
} }
// TODO: use some kind of mapping to saplings
@Override @Override
public int damageDropped(IBlockState state) public int damageDropped(IBlockState state)
{ {
//Ignore all other properties, only the variant is important to ensure different variants use different stacks
BOPTrees tree = ((BOPTrees) state.getValue(this.variantProperty)); BOPTrees tree = ((BOPTrees) state.getValue(this.variantProperty));
return this.getMetaFromState(this.getDefaultState().withProperty(this.variantProperty, tree)); ItemStack stack = BlockBOPSapling.paging.getVariantItem(tree);
return stack.getItemDamage();
} }
// TODO: different fruits for different trees? // TODO: different fruits for different trees?