From 20b189d2c378006eeaaff4d64d99653a3f0dc816 Mon Sep 17 00:00:00 2001
From: Icosider <iura.andrianov@Yandex.ru>
Date: Wed, 29 Jan 2025 22:13:59 +0300
Subject: [PATCH 1/2] Changed the publication of reobfuscated jars

---
 .../legacyforge/dsl/ObfuscationExtension.java    | 16 +++++++++-------
 .../internal/LegacyForgeModDevPlugin.java        |  1 +
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/legacy/java/net/neoforged/moddevgradle/legacyforge/dsl/ObfuscationExtension.java b/src/legacy/java/net/neoforged/moddevgradle/legacyforge/dsl/ObfuscationExtension.java
index e1092624..58044ca0 100644
--- a/src/legacy/java/net/neoforged/moddevgradle/legacyforge/dsl/ObfuscationExtension.java
+++ b/src/legacy/java/net/neoforged/moddevgradle/legacyforge/dsl/ObfuscationExtension.java
@@ -11,10 +11,7 @@
 import org.gradle.api.Action;
 import org.gradle.api.InvalidUserCodeException;
 import org.gradle.api.Project;
-import org.gradle.api.artifacts.Configuration;
-import org.gradle.api.artifacts.ExternalModuleDependency;
-import org.gradle.api.artifacts.FileCollectionDependency;
-import org.gradle.api.artifacts.ProjectDependency;
+import org.gradle.api.artifacts.*;
 import org.gradle.api.attributes.Attribute;
 import org.gradle.api.component.AdhocComponentWithVariants;
 import org.gradle.api.component.ConfigurationVariantDetails;
@@ -122,8 +119,15 @@ public TaskProvider<RemapJar> reobfuscate(TaskProvider<? extends AbstractArchive
             // Move plain jars into a subdirectory to be able to maintain the same classifier for the reobfuscated version
             task.getDestinationDirectory().set(task.getProject().getLayout().getBuildDirectory().dir("devlibs"));
         });
+        return reobf;
+    }
 
-        // Replace the publication of the jar task with the reobfuscated jar
+    /**
+     * Replace the publication of the jar task with the reobfuscated jar
+     *
+     * @param reobf the remapJar task to replace
+     */
+    public void publishReobfuscated(TaskProvider<RemapJar> reobf) {
         var configurations = project.getConfigurations();
         var java = (AdhocComponentWithVariants) project.getComponents().getByName("java");
         for (var configurationName : List.of(JavaPlugin.RUNTIME_ELEMENTS_CONFIGURATION_NAME, JavaPlugin.API_ELEMENTS_CONFIGURATION_NAME)) {
@@ -146,8 +150,6 @@ public TaskProvider<RemapJar> reobfuscate(TaskProvider<? extends AbstractArchive
             java.withVariantsFromConfiguration(config, ConfigurationVariantDetails::skip);
             java.addVariantsFromConfiguration(reobfConfig, spec -> {});
         }
-
-        return reobf;
     }
 
     private static <T> void copyAttribute(Project project, Attribute<T> attribute, Configuration fromConfig, Configuration toConfig) {
diff --git a/src/legacy/java/net/neoforged/moddevgradle/legacyforge/internal/LegacyForgeModDevPlugin.java b/src/legacy/java/net/neoforged/moddevgradle/legacyforge/internal/LegacyForgeModDevPlugin.java
index d10b1cbf..d6c54855 100644
--- a/src/legacy/java/net/neoforged/moddevgradle/legacyforge/internal/LegacyForgeModDevPlugin.java
+++ b/src/legacy/java/net/neoforged/moddevgradle/legacyforge/internal/LegacyForgeModDevPlugin.java
@@ -193,6 +193,7 @@ public void enable(Project project, LegacyForgeModdingSettings settings, LegacyF
         var reobfJar = obf.reobfuscate(
                 project.getTasks().named(JavaPlugin.JAR_TASK_NAME, Jar.class),
                 project.getExtensions().getByType(SourceSetContainer.class).getByName(SourceSet.MAIN_SOURCE_SET_NAME));
+        obf.publishReobfuscated(reobfJar);
 
         project.getTasks().named("assemble", assemble -> assemble.dependsOn(reobfJar));
 

From f6401e464ef3b7489e69e489b011905edfd7ade2 Mon Sep 17 00:00:00 2001
From: Icosider <iura.andrianov@Yandex.ru>
Date: Wed, 29 Jan 2025 22:27:04 +0300
Subject: [PATCH 2/2] Removed wildcard import

---
 .../moddevgradle/legacyforge/dsl/ObfuscationExtension.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/legacy/java/net/neoforged/moddevgradle/legacyforge/dsl/ObfuscationExtension.java b/src/legacy/java/net/neoforged/moddevgradle/legacyforge/dsl/ObfuscationExtension.java
index 58044ca0..218acf6f 100644
--- a/src/legacy/java/net/neoforged/moddevgradle/legacyforge/dsl/ObfuscationExtension.java
+++ b/src/legacy/java/net/neoforged/moddevgradle/legacyforge/dsl/ObfuscationExtension.java
@@ -11,7 +11,10 @@
 import org.gradle.api.Action;
 import org.gradle.api.InvalidUserCodeException;
 import org.gradle.api.Project;
-import org.gradle.api.artifacts.*;
+import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.artifacts.ExternalModuleDependency;
+import org.gradle.api.artifacts.FileCollectionDependency;
+import org.gradle.api.artifacts.ProjectDependency;
 import org.gradle.api.attributes.Attribute;
 import org.gradle.api.component.AdhocComponentWithVariants;
 import org.gradle.api.component.ConfigurationVariantDetails;