firstdarkdev/modfusioner
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Add NeoForge support and switch from closure to action #2

Merged
KP2048 merged 3 commits from master into master 2024-06-02 16:45:00 +02:00
Conversation 0 Commits 3 Files Changed 4 +106 -15
3 changed files with 106 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6650557f32 - Show all commits

21
src/main/java/com/hypherionmc/modfusioner/plugin/FusionerExtension.java
View File

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