updated for Forge Gradle, cleaned up code