Replace deprecated itemid code, fix JavaDoc issues

Just replaced the deprecated Item Id code with actual materials, and removed/renamed a few javadoc entries.