Change Mavenizer dependency output check strategy

Author: Jonathing

src/main/java/net/minecraftforge/gradle/internal/ForgeGradleFlowAction.java

@@ -119,4 +119,24 @@ protected void run(Parameters parameters) {
             parameters.problems().reportAccessTransformersNotApplied(e);
         }
     }
+
+    static abstract class MavenizerSyncCheck extends ForgeGradleFlowAction<MavenizerSyncCheck.Parameters> {
+        static abstract class Parameters extends ForgeGradleFlowAction.Parameters {
+            final DirectoryProperty dependencyOutput = this.getObjects().directoryProperty();
+            final Property<String> dependency = this.getObjects().property(String.class);
+
+            @Inject
+            public Parameters() { }
+        }
+
+        @Inject
+        public MavenizerSyncCheck() { }
+
+        @Override
+        protected void run(Parameters parameters) {
+            if (parameters.dependencyOutput.getAsFile().get().exists()) return;
+
+            parameters.problems().mavenizerOutOfDate(parameters.getFailure().isPresent(), parameters.dependency.get());
+        }
+    }
 }

src/main/java/net/minecraftforge/gradle/internal/ForgeGradleProblems.java

@@ -6,8 +6,10 @@
 
 import net.minecraftforge.gradle.MinecraftMappings;
 import net.minecraftforge.gradleutils.shared.EnhancedProblems;
+import org.gradle.api.Action;
 import org.gradle.api.artifacts.Dependency;
 import org.gradle.api.artifacts.ExternalModuleDependency;
+import org.gradle.api.problems.ProblemSpec;
 import org.gradle.api.problems.Problems;
 import org.gradle.api.problems.Severity;
 import org.gradle.api.provider.ProviderFactory;
@@ -127,10 +129,12 @@ RuntimeException changingMinecraftDependency(Dependency dependency) {
     //endregion
 
     //region Minecraft Maven
-    RuntimeException mavenizerOutOfDateCompile(Object dependency) {
-        return this.throwing(new IllegalStateException(), "mavenizer-out-of-date-for-compile", "Minecraft Mavenizer is out-of-date", spec -> spec
+    void mavenizerOutOfDate(boolean throwIt, Object dependency) {
+        String name = "mavenizer-out-of-date";
+        String displayName = "Minecraft Mavenizer is out-of-date";
+        Action<? super ProblemSpec> problemSpec = spec -> spec
             .details("""
-                Gradle cannot compile your sources because the Minecraft Mavenizer is out-of-date.
+                Gradle cannot compile your sources or run the game because the Minecraft Mavenizer is out-of-date.
                 The Mavenizer must be re-run in order for the changes made to the Minecraft dependency to take effect.
                 Affected dependency: '%s'"""
                 .formatted(dependency))
@@ -139,22 +143,12 @@ RuntimeException mavenizerOutOfDateCompile(Object dependency) {
             .solution("Run `gradlew` with no arguments, as this will automatically synchronize the Mavenizer.")
             .solution("Manually run the `syncMavenizer` task, located in the 'Build Setup' group.")
             .solution("Temporary revert any edits to the Minecraft dependency until the Mavenizer is re-run.")
-            .solution(HELP_MESSAGE));
-    }
+            .solution(HELP_MESSAGE);
 
-    RuntimeException mavenizerOutOfDateRunTask(Object dependency) {
-        return this.throwing(new IllegalStateException(), "mavenizer-out-of-date-for-run", "Minecraft Mavenizer is out-of-date", spec -> spec
-            .details("""
-                Gradle cannot run the game with Slime Launcher because the Minecraft Mavenizer is out-of-date.
-                The Mavenizer must be re-run in order for the changes made to the Minecraft dependency to take effect.
-                Affected dependency: '%s'"""
-                .formatted(dependency))
-            .severity(Severity.ERROR)
-            .solution("Re-import your project in your IDE, as this will automatically synchronize the Mavenizer.")
-            .solution("Run `gradlew` with no arguments, as this will automatically synchronize the Mavenizer.")
-            .solution("Manually run the `syncMavenizer` task, located in the 'Build Setup' group.")
-            .solution("Temporary revert any edits to the Minecraft dependency until the Mavenizer is re-run.")
-            .solution(HELP_MESSAGE));
+        if (throwIt)
+            throw this.throwing(new IllegalStateException(displayName), name, displayName, problemSpec);
+        else
+            this.report(name, displayName, problemSpec);
     }
 
     void reportMcMavenNotDeclared() {

src/main/java/net/minecraftforge/gradle/internal/MinecraftDependencyImpl.java

@@ -27,6 +27,8 @@
 import org.gradle.api.file.Directory;
 import org.gradle.api.file.ProjectLayout;
 import org.gradle.api.file.RegularFileProperty;
+import org.gradle.api.flow.FlowProviders;
+import org.gradle.api.flow.FlowScope;
 import org.gradle.api.model.ObjectFactory;
 import org.gradle.api.plugins.ExtensionAware;
 import org.gradle.api.plugins.JavaPluginExtension;
@@ -36,6 +38,7 @@
 import org.gradle.api.tasks.SourceSet;
 import org.gradle.api.tasks.TaskProvider;
 import org.gradle.api.tasks.compile.JavaCompile;
+import org.gradle.internal.impldep.com.google.common.base.Optional;
 import org.jetbrains.annotations.Nullable;
 
 import javax.inject.Inject;
@@ -60,6 +63,10 @@ abstract class MinecraftDependencyImpl implements MinecraftDependencyInternal {
 
     protected abstract @Inject Project getProject();
 
+    protected abstract @Inject FlowScope getFlowScope();
+
+    protected abstract @Inject FlowProviders getFlowProviders();
+
     protected abstract @Inject ObjectFactory getObjects();
 
     protected abstract @Inject ProjectLayout getProjectLayout();
@@ -155,13 +162,13 @@ public void handle(Configuration configuration) {
 
     @Override
     public void handle(SourceSet sourceSet) {
-        var problems = this.problems;
         var asString = this.asString.get();
         var dependencyOutput = this.mavenizerOutput.map(dir -> dir.dir(this.asPath)).get().get().getAsFile();
-        getProject().getTasks().named(sourceSet.getCompileJavaTaskName(), JavaCompile.class, task -> {
-            task.doFirst(t -> {
-                if (!dependencyOutput.exists())
-                    throw problems.mavenizerOutOfDateCompile(asString);
+        getFlowScope().always(ForgeGradleFlowAction.MavenizerSyncCheck.class, spec -> {
+            spec.parameters(parameters -> {
+                parameters.getFailure().set(getFlowProviders().getBuildWorkResult().map(r -> r.getFailure().orElse(null)));
+                parameters.dependencyOutput.set(dependencyOutput);
+                parameters.dependency.set(asString);
             });
         });
 
@@ -176,18 +183,6 @@ public void handle(SourceSet sourceSet) {
         this.sourceSetName = sourceSet.getName();
     }
 
-    void handle(TaskProvider<SlimeLauncherExec> runTask) {
-        var problems = this.problems;
-        var asString = this.asString.get();
-        var dependencyOutput = this.mavenizerOutput.map(dir -> dir.dir(this.asPath)).get().get().getAsFile();
-        runTask.configure(task -> {
-            task.doFirst(t -> {
-                if (!dependencyOutput.exists())
-                    throw problems.mavenizerOutOfDateRunTask(asString);
-            });
-        });
-    }
-
     @Override
     public MinecraftMappings getMappings() {
         try {

src/main/java/net/minecraftforge/gradle/internal/MinecraftExtensionImpl.java

@@ -270,7 +270,6 @@ private void finish(Project project) {
                         var impl = (MinecraftDependencyImpl) minecraftDependency;
                         this.runs.forEach(options -> {
                             var task = SlimeLauncherExec.register(project, sourceSet, options, impl.module.get(), impl.version.get(), impl.asPath.get(), impl.asString.get(), single);
-                            impl.handle(task);
                         });
                     }
                 });