Clean up and expand on https://github.com/RetroGradle/ForgeFlower/pull/10
Clean up and expand on RetroGradle/ForgeFlower#10