Rewrite remainder of the Check tasks, migrate to grouped object

Rewrite ExtractInheritance task, move to Check group as its the only place that uses it
Make InstallerJar a Jar task so we can configure manifest if we want
Rewrite ValidateDeprecations
Expose Searge named jar from mcp.files
Rewrite ByteCodePredicateFinder -> MethodCallFinder

Author: LexManos

src/main/groovy/net/minecraftforge/forgedev/ForgeDevExtension.java

@@ -6,7 +6,9 @@
 
 import net.minecraftforge.forgedev.legacy.tasks.Util;
 import net.minecraftforge.forgedev.legacy.values.CIRuntime;
-import net.minecraftforge.forgedev.tasks.checks.CheckTask;
+import net.minecraftforge.forgedev.tasks.MethodCallFinder;
+import net.minecraftforge.forgedev.tasks.ValidateDeprecations;
+import net.minecraftforge.forgedev.tasks.checks.Checks;
 import net.minecraftforge.forgedev.tasks.compat.LegacyExtractZip;
 import net.minecraftforge.forgedev.tasks.compat.LegacyMergeFilesTask;
 import net.minecraftforge.forgedev.tasks.filtering.LegacyFilterNewJar;
@@ -31,7 +33,6 @@
 import net.minecraftforge.forgedev.tasks.srg2source.ApplyRangeMap;
 import net.minecraftforge.forgedev.tasks.srg2source.ExtractRangeMap;
 import net.minecraftforge.gradleutils.shared.Closures;
-import org.codehaus.groovy.runtime.StringGroovyMethods;
 import org.gradle.api.Action;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
@@ -78,9 +79,7 @@ public abstract class ForgeDevExtension {
     private final DirectoryProperty mavenizerRepo = this.getObjects().directoryProperty();
 
     protected abstract @Inject ObjectFactory getObjects();
-
     protected abstract @Inject ProviderFactory getProviders();
-
     protected abstract @Inject ProjectLayout getProjectLayout();
 
     private final Project project;
@@ -139,24 +138,16 @@ public Installer installer(String name, Action<Installer> action) {
     // boolean input. Registers the 'check{Name}' version to the 'check' group
     // and the 'checkAndFix{Name}' task to the 'checkAndFix' group.
     // =====================================================================
-    public <T extends CheckTask> void check(String taskName, Class<T> clazz) {
-        check(taskName, clazz, Util.noop());
+    private Checks checks;
+    public Checks getChecks() {
+        if (checks == null)
+            checks = this.getObjects().newInstance(Checks.class, this.project);
+        return checks;
     }
-    public <T extends CheckTask> void check(String taskName, Class<T> clazz, Action<? super T> action) {
-        var tasks = this.project.getTasks();
-        taskName = StringGroovyMethods.capitalize(taskName);
-
-        var check = tasks.register("check" + taskName, clazz, task -> {
-            action.execute(task);
-            task.getFix().set(false);
-        });
-        tasks.named(LifecycleBasePlugin.CHECK_TASK_NAME, task -> task.dependsOn(check));
-
-        var checkAndFix = tasks.register("checkAndFix" + taskName, clazz, task -> {
-            action.execute(task);
-            task.getFix().set(true);
-        });
-        tasks.named("checkAndFix", task -> task.dependsOn(checkAndFix));
+    public Checks checks(Action<Checks> action) {
+        var ret = getChecks();
+        action.execute(ret);
+        return ret;
     }
     // ===============================================================================
 
@@ -175,6 +166,29 @@ public Shim shim(String name, Action<Shim> action) {
         return ret;
     }
     // ===============================================================================
+    public TaskProvider<MethodCallFinder> methodCallFinder(String name) {
+        return methodCallFinder(name, Util.noop());
+    }
+    public TaskProvider<MethodCallFinder> methodCallFinder(String name, Action<MethodCallFinder> action) {
+        return this.project.getTasks().register(name, MethodCallFinder.class, action);
+    }
+    // ===============================================================================
+    public TaskProvider<ValidateDeprecations> validateDeprecations() {
+        return validateDeprecations(this.project.getTasks().named("jar", Jar.class));
+    }
+    public TaskProvider<ValidateDeprecations> validateDeprecations(TaskProvider<? extends AbstractArchiveTask> jar) {
+        var tasks = this.project.getTasks();
+        var ret = tasks.register("validate" + Util.capitalize(jar.getName()) + "Deprecations", ValidateDeprecations.class, task -> {
+            task.setGroup(LifecycleBasePlugin.VERIFICATION_GROUP);
+            task.getInput().set(jar.flatMap(AbstractArchiveTask::getArchiveFile));
+            var patcher = this.project.getExtensions().findByType(LegacyPatcherExtension.class);
+            if (patcher != null)
+                task.getMcVersion().set(patcher.getMcVersion());
+        });
+        tasks.named(LifecycleBasePlugin.CHECK_TASK_NAME, check -> check.dependsOn(ret));
+        return ret;
+    }
+    // ===============================================================================
 
 
 

src/main/groovy/net/minecraftforge/forgedev/LegacyMCPExtension.java

@@ -17,6 +17,7 @@
 import org.gradle.jvm.toolchain.JavaLauncher;
 
 import javax.inject.Inject;
+import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -94,27 +95,29 @@ public MinecraftFiles getFiles() {
     public MinecraftFiles getFiles(String version) {
         var ret = this.files.get(version);
         if (ret == null) {
-            //var client = mavenizer("client", version, false);
-            //var server = mavenizer("server", version, false);
-            var joined = mavenizer("joined", version, false);
+            //var client = mavenizer("client", version, true);
+            //var server = mavenizer("server", version, true);
+            var joined = mavenizer("joined", version, true);
 
-            ret = getObjects().newInstance(MinecraftFiles.class, plugin, joined);
+            ret = getObjects().newInstance(MinecraftFiles.class, plugin, joined.info, joined.output);
             this.files.put(version, ret);
         }
         return ret;
     }
 
-    private Provider<MCPSetupFiles> mavenizer(String pipeline, String version, boolean searge) {
+    private record Output(Provider<MCPSetupFiles> info, File output) {}
+    private Output mavenizer(String pipeline, String version, boolean searge) {
         var fileName = "mavenizer/mcp-" + version + "-files-" + pipeline;
         if (searge)
             fileName += "-searge";
+
         // TODO: [ForgeDevPlugin] Make single mavenizer task to get the 'vanilla' files we need
         // We also need a way to get the 'slim' artifacts for older versions which don't use bundled server jar
         // Could still name it 'serverExtracted' in the json
         var output = this.plugin.localCaches().file("mavenizer/" + fileName + ".jar").get().getAsFile();
         var outputJson = this.plugin.localCaches().file("mavenizer/" + fileName + ".json").get().getAsFile();
 
-        return this.getProviders().of(MavenizerValueSource.class, spec -> {
+        var info = this.getProviders().of(MavenizerValueSource.class, spec -> {
             spec.parameters(params -> {
                 var tool = this.plugin.getTool(Tools.MAVENIZER);
                 params.getClasspath().setFrom(tool.getClasspath());
@@ -142,18 +145,22 @@ private Provider<MCPSetupFiles> mavenizer(String pipeline, String version, boole
             });
         })
         .map(v -> JsonData.fromJson(outputJson, MCPSetupFiles.class));
+
+        return new Output(info, output);
     }
 
     public static abstract class MinecraftFiles {
         private final ForgeDevPlugin plugin;
         private final Provider<MCPSetupFiles> info;
+        private final File joinedSearge;
         protected abstract @Inject ObjectFactory getObjects();
         protected abstract @Inject ProviderFactory getProviders();
 
         @Inject
-        public MinecraftFiles(ForgeDevPlugin plugin, Provider<MCPSetupFiles> info) {
+        public MinecraftFiles(ForgeDevPlugin plugin, Provider<MCPSetupFiles> info, File joinedSearge) {
             this.plugin = plugin;
             this.info = info;
+            this.joinedSearge = joinedSearge;
         }
 
         private Provider<RegularFile> get(Transformer<String, MCPSetupFiles> field) {
@@ -180,5 +187,11 @@ public Provider<RegularFile> getServerExtracted() {
         public Provider<RegularFile> getServerMappings() {
             return get(info -> info.serverMappings);
         }
+        public Provider<RegularFile> getLibraryList() {
+            return get(info -> info.librariesList);
+        }
+        public Provider<RegularFile> getJoinedSearge() {
+            return get(info -> this.joinedSearge.getAbsolutePath());
+        }
     }
 }

src/main/groovy/net/minecraftforge/forgedev/PatcherExtension.java

@@ -7,7 +7,6 @@
 import net.minecraftforge.forgedev.tasks.filtering.LegacyFilterNewJar;
 import net.minecraftforge.forgedev.tasks.generation.GeneratePatcherConfigV2;
 import net.minecraftforge.forgedev.tasks.installertools.DownloadMappings;
-import net.minecraftforge.forgedev.tasks.installertools.ExtractInheritance;
 import net.minecraftforge.forgedev.tasks.mcp.MavenizerMCPSetup;
 import net.minecraftforge.forgedev.tasks.mcp.MavenizerRawArtifact;
 import net.minecraftforge.forgedev.tasks.obfuscation.LegacyRenameJar;
@@ -27,9 +26,6 @@
 import org.gradle.api.tasks.bundling.Zip;
 
 import javax.inject.Inject;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
 
 abstract class ForgeBuildPlugin extends EnhancedPlugin<Project> {
     static final String NAME = "forge-build";
@@ -67,24 +63,6 @@ public void setup(Project project) {
             var downloadServerMappings = tasks.named("downloadServerMappings", DownloadMappings.class);
             var jar = tasks.named("jar", Jar.class);
 
-            var extractInheritance = tasks.register("extractInheritance", ExtractInheritance.class, task -> {
-                task.setGroup("Forge downloads");
-                task.dependsOn(setupMCP);
-
-                task.getAdditionalArgs().add("--annotations");
-                task.getInput().fileProvider(tasks.named("genJoinedBinPatches", CreateBinPatches.class).map(t -> t.getClean().getSingleFile()));
-                task.getLibraries().from(setupMCP.flatMap(MavenizerMCPSetup::getLibrariesList).map(libraries -> {
-                    try {
-                        return Files.readAllLines(libraries.getAsFile().toPath()).stream()
-                                .map(line -> line.substring(3)) // remove -e=
-                                .map(File::new)
-                                .toList();
-                    } catch (IOException e) {
-                        throw new RuntimeException(e);
-                    }
-                }));
-            });
-
             var createClientOfficial = tasks.register("createClientOfficial", LegacyRenameJar.class, task -> {
                 task.dependsOn(setupMCP);