Sort variants, and fix natives not being in variant files

Author: LexManos

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.3'
     library 'utils-hash',     'net.minecraftforge', 'hash-utils'      version '0.2.2'
-    library 'utils-data',     'net.minecraftforge', 'json-data-utils' version '0.4.3'
+    library 'utils-data',     'net.minecraftforge', 'json-data-utils' version '0.4.7'
     library 'utils-logging',  'net.minecraftforge', 'log-utils'       version '0.5.1'
     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/MinecraftMaven.java

@@ -515,7 +515,7 @@ private void updateVariants(Artifact artifact) {
         var target = new File(this.output, artifact.withExtension("module").getLocalPath());
         var cache = Util.cache(target);
         for (var input : inputs) {
-            cache.add(input);
+            cache.add(input.getName(), input);
         }
 
         if (Mavenizer.checkCache(target, cache))

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

@@ -26,6 +26,7 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.EnumSet;
 import java.util.HashMap;
@@ -90,6 +91,7 @@ protected Supplier<GradleModule.Variant[]> metadataVariant() {
     protected static Task variantTask(Task parent, Supplier<GradleModule.Variant[]> supplier) {
         return Task.named(parent.name() + "[variants]", Task.deps(parent), () -> {
             var variants = supplier.get();
+            Arrays.sort(variants, (a,b) -> a.name.compareTo(b.name)); // Sort names to make output stable
 
             var variantFile = new File(parent.execute().getAbsolutePath() + ".variants");
             var json = JsonData.toJson(variants);

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

@@ -754,7 +754,7 @@ record Info(File file, Artifact artifact, Predicate<String> filter, Function<Str
             var servicesLists = new HashMap<String, List<String>>();
             var seen = new HashSet<String>();
             for (var info : files) {
-                try (var zin = new ZipInputStream(new FileInputStream(this.data))) {
+                try (var zin = new ZipInputStream(new FileInputStream(info.file))) {
                     ZipEntry entry;
                     while ((entry = zin.getNextEntry()) != null) {
                         if (FileUtils.isBlockOrSF(entry.getName()))