Add missing NBTType.END

Also clean up some extra imports leftover from when I had an id Map
instead of an array.