Merge upstream

This commit is contained in:
Vincent Lee committed 2016-01-08 12:00:01 -06:00
commit a4a77fb20f
12 files changed
+69 -38

No files matched your search

@@ -54,6 +54,11 @@ public class BlockAltGrass extends BlockMod implements ILexiconable {
return new BlockState(this, BotaniaStateProps.ALTGRASS_VARIANT);
}
@Override
public boolean isToolEffective(String type, IBlockState state) {
return type.equals("shovel");
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(BotaniaStateProps.ALTGRASS_VARIANT).ordinal();
@@ -108,7 +113,8 @@ public class BlockAltGrass extends BlockMod implements ILexiconable {
@Override
public boolean canSustainPlant(IBlockAccess world, BlockPos pos, EnumFacing direction, IPlantable plantable) {
return plantable.getPlantType(world, pos.down()) == EnumPlantType.Plains;
EnumPlantType type = plantable.getPlantType(world, pos.down());
return type == EnumPlantType.Plains || type == EnumPlantType.Beach;
}
@Override