diff --git a/src/main/java/com/hypherionmc/modfusioner/plugin/FusionerExtension.java b/src/main/java/com/hypherionmc/modfusioner/plugin/FusionerExtension.java index 18869a5..aa8c2cb 100644 --- a/src/main/java/com/hypherionmc/modfusioner/plugin/FusionerExtension.java +++ b/src/main/java/com/hypherionmc/modfusioner/plugin/FusionerExtension.java @@ -9,7 +9,6 @@ */ package com.hypherionmc.modfusioner.plugin; -import groovy.lang.Closure; import lombok.Getter; import lombok.Setter; import org.gradle.api.Action; @@ -109,45 +108,45 @@ public class FusionerExtension { /** * Set up the forge project configurations */ - public FusionerExtension.ForgeConfiguration forge(Closure closure) { + public FusionerExtension.ForgeConfiguration forge(Action action) { forgeConfiguration = new FusionerExtension.ForgeConfiguration(); - ModFusionerPlugin.rootProject.configure(forgeConfiguration, closure); + action.execute(forgeConfiguration); return forgeConfiguration; } /** * Set up the neoforge project configurations */ - public FusionerExtension.NeoForgeConfiguration neoforge(Closure closure) { + public FusionerExtension.NeoForgeConfiguration neoforge(Action action) { neoforgeConfiguration = new FusionerExtension.NeoForgeConfiguration(); - ModFusionerPlugin.rootProject.configure(neoforgeConfiguration, closure); + action.execute(neoforgeConfiguration); return neoforgeConfiguration; } /** * Set up the fabric project configurations */ - public FusionerExtension.FabricConfiguration fabric(Closure closure) { + public FusionerExtension.FabricConfiguration fabric(Action action) { fabricConfiguration = new FusionerExtension.FabricConfiguration(); - ModFusionerPlugin.rootProject.configure(fabricConfiguration, closure); + action.execute(fabricConfiguration); return fabricConfiguration; } /** * Set up the quilt project configurations */ - public FusionerExtension.QuiltConfiguration quilt(Closure closure) { + public FusionerExtension.QuiltConfiguration quilt(Action action) { quiltConfiguration = new FusionerExtension.QuiltConfiguration(); - ModFusionerPlugin.rootProject.configure(quiltConfiguration, closure); + action.execute(quiltConfiguration); return quiltConfiguration; } /** * Set up custom project configurations */ - public FusionerExtension.CustomConfiguration custom(Closure closure) { + public FusionerExtension.CustomConfiguration custom(Action action) { FusionerExtension.CustomConfiguration customConfiguration = new FusionerExtension.CustomConfiguration(); - ModFusionerPlugin.rootProject.configure(customConfiguration, closure); + action.execute(customConfiguration); if (customConfiguration.getProjectName() == null || customConfiguration.getProjectName().isEmpty()) { throw new IllegalStateException("Custom project configurations need to specify a \"projectName\"");