Fixed a few warnings added getter for baseHPS in upgrade.java