Small cleanup
Organized imports
Merge branch 'master' of
https://github.com/Darkhax-Minecraft/MoreSwordsMod.git