Fix for Issue #119

the related code is kinda complex and sometimes inconsistent, I think it could benefit from some refactoring. Do you have any work planned on TileEntityAssembly* code? If not, I'd like to try and straighten things out over the next few weeks.