Merge pull request #676 from GirafiStudios/BOP-1.8.9-3.0.x

Made Flax require shears to drop.
This commit is contained in:
Forstride 2016-02-14 01:19:21 -05:00
commit 1a85b43159

View file

@ -210,6 +210,8 @@ public class BlockBOPDoublePlant extends BlockBOPDoubleDecoration implements ISh
DoublePlantType type = (DoublePlantType) lowerState.getValue(VARIANT); DoublePlantType type = (DoublePlantType) lowerState.getValue(VARIANT);
switch (type) switch (type)
{ {
case FLAX:
break;
case TALL_CATTAIL: case TALL_CATTAIL:
ret.add(BlockBOPPlant.paging.getVariantItem(BOPPlants.CATTAIL)); ret.add(BlockBOPPlant.paging.getVariantItem(BOPPlants.CATTAIL));
break; break;
@ -229,10 +231,11 @@ public class BlockBOPDoublePlant extends BlockBOPDoubleDecoration implements ISh
} }
@Override @Override
public List<ItemStack> getLowerShearDrops(ItemStack item, IBlockAccess world, BlockPos lowerPos, IBlockState lowerState, int fortune) { public List<ItemStack> getLowerShearDrops(ItemStack item, IBlockAccess world, BlockPos lowerPos, IBlockState lowerState, int fortune)
{
// start with an empty stack // start with an empty stack
List<ItemStack> ret = new java.util.ArrayList<ItemStack>(); List<ItemStack> ret = new java.util.ArrayList<ItemStack>();
// add items based on the VARIANT // add items based on the VARIANT
// note that the sheared items are dropped in addition to regular drops // note that the sheared items are dropped in addition to regular drops
// since the default in getLowerDrops is to drop the (lower) block, the default here is to drop nothing (so we don't have a duplicate) // since the default in getLowerDrops is to drop the (lower) block, the default here is to drop nothing (so we don't have a duplicate)
@ -241,6 +244,8 @@ public class BlockBOPDoublePlant extends BlockBOPDoubleDecoration implements ISh
DoublePlantType type = (DoublePlantType) lowerState.getValue(VARIANT); DoublePlantType type = (DoublePlantType) lowerState.getValue(VARIANT);
switch (type) switch (type)
{ {
case FLAX:
ret.add(this.getVariantItem(type));
default: default:
break; break;
} }