More ItemStack TE Integration, cleaned up CoFHLib