Wood refactor

Prepping for barrel, bucket and liquid update for Forge compatibility