Add API variant using scoped dependencies

Author: Jonathing

settings.gradle

@@ -41,7 +41,7 @@ dependencyResolutionManagement.versionCatalogs.register('libs') {
     library 'utils-download', 'net.minecraftforge', 'download-utils'  version '0.4.0'
     library 'utils-files',    'net.minecraftforge', 'file-utils'      version '0.3.2'
     library 'utils-hash',     'net.minecraftforge', 'hash-utils'      version '0.1.12'
-    library 'utils-data',     'net.minecraftforge', 'json-data-utils' version '0.4.0'
+    library 'utils-data',     'net.minecraftforge', 'json-data-utils' version '0.4.1'
     library 'utils-logging',  'net.minecraftforge', 'log-utils'       version '0.5.0'
     library 'utils-os',       'net.minecraftforge', 'os-utils'        version '0.1.0'
     bundle 'utils', ['utils-download', 'utils-files', 'utils-hash', 'utils-data', 'utils-logging', 'utils-os']

src/main/java/net/minecraftforge/mcmaven/impl/repo/Repo.java

@@ -24,6 +24,7 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -110,8 +111,12 @@ protected Supplier<GradleModule.Variant[]> simpleVariant(String name, Mappings m
         };
     }
 
+    protected GradleModule.Variant[] classVariants(Mappings mappings, MCPSide side) {
+        return classVariants(mappings, side, List.of(), List.of(), List.of());
+    }
+
     // Classes needs a variant for each OS type so that we can have different natives
-    protected GradleModule.Variant[] classVariants(Mappings mappings, MCPSide side, Artifact... extraDeps) {
+    protected GradleModule.Variant[] classVariants(Mappings mappings, MCPSide side, Collection<Artifact> extraDeps, Collection<Artifact> extraCompileDeps, Collection<Artifact> extraRuntimeDeps) {
         var all = new ArrayList<Artifact>();
         var natives = new HashMap<GradleAttributes.OperatingSystemFamily, List<Artifact>>();
 
@@ -173,6 +178,10 @@ protected GradleModule.Variant[] classVariants(Mappings mappings, MCPSide side,
             variants.add(variant);
         }
 
+        var apiVariant = GradleModule.Variant.of("api-classes", common);
+        apiVariant.attribute("org.gradle.usage", "java-api");
+        variants.add(apiVariant);
+
         return variants.toArray(new GradleModule.Variant[0]);
     }
 

src/main/java/net/minecraftforge/mcmaven/impl/repo/forge/ForgeRepo.java

@@ -35,6 +35,7 @@
 import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 import java.util.stream.Stream;
 
@@ -260,6 +261,23 @@ private static Task pom(File build, Patcher patcher, String version, Artifact cl
     protected GradleModule.Variant[] classVariants(Mappings mappings, Patcher patcher, Artifact... extraDeps) {
         var extra = new ArrayList<>(Arrays.asList(extraDeps));
         extra.addAll(patcher.getArtifacts());
-        return super.classVariants(mappings, patcher.getMCPSide(), extra.toArray(Artifact[]::new));
+
+        var extraCompile = new ArrayList<Artifact>();
+        var extraRuntime = new ArrayList<Artifact>();
+        if (patcher.config.extraDependencies != null) {
+            if (patcher.config.extraDependencies.compileOnly != null) {
+                for (var descriptor : patcher.config.extraDependencies.compileOnly) {
+                    extraCompile.add(Artifact.from(descriptor));
+                }
+            }
+
+            if (patcher.config.extraDependencies.runtimeOnly != null) {
+                for (var descriptor : patcher.config.extraDependencies.runtimeOnly) {
+                    extraRuntime.add(Artifact.from(descriptor));
+                }
+            }
+        }
+
+        return super.classVariants(mappings, patcher.getMCPSide(), extra, extraCompile, extraRuntime);
     }
 }