From 1569a66e0007e3f171fd2aeb993b01879633c3af Mon Sep 17 00:00:00 2001 From: KernelPanic Date: Sun, 2 Jun 2024 11:21:58 -0400 Subject: [PATCH] Fix missing entry for NeoForge in the jar resolution step (#4) * add neoforge support * move extension from closure to action to better support kotlin dsl * add neoforge to the readme.md * add missing entry in plugin apply method for neoforge jar resolution --- readme.md | 2 +- .../modfusioner/plugin/ModFusionerPlugin.java | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 04f67cc..e266807 100644 --- a/readme.md +++ b/readme.md @@ -60,7 +60,7 @@ fusioner { // NeoForge Project neoforge { - projectName = "NeoForge" // The name of the project that contains the fabric code + projectName = "NeoForge" // The name of the project that contains the neoforge code inputTaskName = "remapJar" // The name of the build task for the neoforge project // OR // inputFile = "NeoForge/build/libs/MyMod-NeoForge-1.0.jar" // Use a custom jar input diff --git a/src/main/java/com/hypherionmc/modfusioner/plugin/ModFusionerPlugin.java b/src/main/java/com/hypherionmc/modfusioner/plugin/ModFusionerPlugin.java index f842d29..6aca77a 100644 --- a/src/main/java/com/hypherionmc/modfusioner/plugin/ModFusionerPlugin.java +++ b/src/main/java/com/hypherionmc/modfusioner/plugin/ModFusionerPlugin.java @@ -61,6 +61,18 @@ public class ModFusionerPlugin implements Plugin { ); } + if (modFusionerExtension.getNeoforgeConfiguration() != null + && modFusionerExtension.getNeoforgeConfiguration().inputTaskName != null + && !modFusionerExtension.getNeoforgeConfiguration().inputTaskName.isEmpty()) { + if (ccc.getName().equals(modFusionerExtension.getNeoforgeConfiguration().getProjectName())) + resolveInputTasks( + ccc, + modFusionerExtension.getNeoforgeConfiguration().getInputTaskName(), + modFusionerExtension.getNeoforgeConfiguration().getProjectName(), + task + ); + } + if (modFusionerExtension.getFabricConfiguration() != null && modFusionerExtension.getFabricConfiguration().inputTaskName != null && !modFusionerExtension.getFabricConfiguration().inputTaskName.isEmpty()) {