Warlock.java

Warlock.java + other necessary adjustments