updated for Forge Gradle, cleaned up some code