Improve texture pack support and fix them, because I broke 'em with that
condition, which is not needed anyway *.*