More progress on v2 api

Author: thecatcore

build.gradle

@@ -163,3 +163,11 @@ Now allow ModRemappers to disable mixin remapping which is enabled by default fo
 		embedded.version "spasm", project.spasm_version
 	}
 }
+
+task testmodJar(type: Jar) {
+	from sourceSets.test.output
+	destinationDirectory = project.layout.buildDirectory.dir("libs")
+	archiveClassifier.set("testmod")
+}
+
+build.dependsOn testmodJar

src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/api/v2/MappingsConfig.java

@@ -0,0 +1,18 @@
+package io.github.fabriccompatibilitylayers.modremappingapi.api.v2;
+
+import io.github.fabriccompatibilitylayers.modremappingapi.impl.DefaultMappingsConfig;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.InputStream;
+import java.util.Map;
+import java.util.function.Supplier;
+
+public interface MappingsConfig {
+    @Nullable String getSourceNamespace();
+    @Nullable Supplier<InputStream> getExtraMappings();
+    Map<String, String> getRenamingMap();
+
+    static MappingsConfig defaultConfig() {
+        return new DefaultMappingsConfig();
+    }
+}

src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/api/v2/ModCandidate.java

@@ -10,4 +10,12 @@ public interface ModCandidate {
     String getType();
     @Nullable String getAccessWidenerPath();
     @Nullable ModCandidate getParent();
+    @Nullable String getVersion();
+    @Nullable String getParentSubPath();
+    String getDestinationName();
+    ModDiscovererConfig getDiscovererConfig();
+    void setAccessWidener(byte[] data);
+    byte @Nullable [] getAccessWidener();
+    void setDestination(Path destination);
+    @Nullable Path getDestination();
 }

src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/api/v2/ModDiscovererConfig.java

@@ -18,12 +18,14 @@ static Builder builder(String folderName) {
     boolean searchRecursively();
     Predicate<String> getDirectoryFilter();
     BiFunction<Path, List<String>, List<ModCandidate>> getCandidateCollector();
+    boolean getExportToOriginalFolder();
 
     interface Builder {
         Builder fileNameMatcher(String pattern);
         Builder searchRecursively(boolean searchRecursively);
         Builder directoryFilter(Predicate<String> filter);
         Builder candidateCollector(BiFunction<Path, List<String>, List<ModCandidate>> collector);
+        Builder exportToOriginalFolder(boolean exportToOriginalFolder);
 
         ModDiscovererConfig build();
     }

src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/api/v2/ModRemapper.java

@@ -7,4 +7,7 @@ public interface ModRemapper {
 
     List<ModDiscovererConfig> getModDiscoverers();
     List<ModRemapper> collectSubRemappers(List<ModCandidate> discoveredMods);
+    MappingsConfig getMappingsConfig();
+    List<RemappingFlags> getRemappingFlags();
+    void afterRemapping();
 }

src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/RemappingFlags.java renamed to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/api/v2/RemappingFlags.java

@@ -1,4 +1,4 @@
-package io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper;
+package io.github.fabriccompatibilitylayers.modremappingapi.api.v2;
 
 import org.jetbrains.annotations.ApiStatus;
 

src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/DefaultMappingsConfig.java

@@ -0,0 +1,25 @@
+package io.github.fabriccompatibilitylayers.modremappingapi.impl;
+
+import io.github.fabriccompatibilitylayers.modremappingapi.api.v2.MappingsConfig;
+
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Supplier;
+
+public class DefaultMappingsConfig implements MappingsConfig {
+    @Override
+    public String getSourceNamespace() {
+        return "official";
+    }
+
+    @Override
+    public Supplier<InputStream> getExtraMappings() {
+        return null;
+    }
+
+    @Override
+    public Map<String, String> getRenamingMap() {
+        return new HashMap<>();
+    }
+}

src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/DefaultModCandidate.java

@@ -1,17 +1,21 @@
 package io.github.fabriccompatibilitylayers.modremappingapi.impl;
 
 import io.github.fabriccompatibilitylayers.modremappingapi.api.v2.ModCandidate;
+import io.github.fabriccompatibilitylayers.modremappingapi.api.v2.ModDiscovererConfig;
 import org.jetbrains.annotations.Nullable;
 
 import java.nio.file.Path;
 
 public class DefaultModCandidate implements ModCandidate {
     private final String id;
     private final Path path;
+    private final ModDiscovererConfig discovererConfig;
+    private Path destination;
 
-    public DefaultModCandidate(Path path) {
+    public DefaultModCandidate(Path path, ModDiscovererConfig discovererConfig) {
         this.id = path.getFileName().toString().replace(".jar", "").replace(".zip", "").replace(" ", "_");
         this.path = path;
+        this.discovererConfig = discovererConfig;
     }
 
     @Override
@@ -38,4 +42,44 @@ public String getType() {
     public @Nullable ModCandidate getParent() {
         return null;
     }
+
+    @Override
+    public @Nullable String getVersion() {
+        return null;
+    }
+
+    @Override
+    public @Nullable String getParentSubPath() {
+        return null;
+    }
+
+    @Override
+    public String getDestinationName() {
+        return this.path.getFileName().toString();
+    }
+
+    @Override
+    public ModDiscovererConfig getDiscovererConfig() {
+        return discovererConfig;
+    }
+
+    @Override
+    public void setAccessWidener(byte[] data) {
+
+    }
+
+    @Override
+    public byte @Nullable [] getAccessWidener() {
+        return null;
+    }
+
+    @Override
+    public void setDestination(Path destination) {
+        this.destination = destination;
+    }
+
+    @Override
+    public Path getDestination() {
+        return this.destination;
+    }
 }

src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/ModDiscovererConfigImpl.java

@@ -19,13 +19,15 @@ public class ModDiscovererConfigImpl implements ModDiscovererConfig {
     private final boolean searchRecursively;
     private final Predicate<String> directoryFilter;
     private final @Nullable BiFunction<Path, List<String>, List<ModCandidate>> candidateCollector;
+    private final boolean exportToOriginalFolder;
 
-    private ModDiscovererConfigImpl(String folderName, Pattern fileNameMatcher, boolean searchRecursively, Predicate<String> directoryFilter, @Nullable BiFunction<Path, List<String>, List<ModCandidate>> candidateCollector) {
+    private ModDiscovererConfigImpl(String folderName, Pattern fileNameMatcher, boolean searchRecursively, Predicate<String> directoryFilter, @Nullable BiFunction<Path, List<String>, List<ModCandidate>> candidateCollector, boolean exportToOriginalFolder) {
         this.folderName = folderName;
         this.fileNameMatcher = fileNameMatcher;
         this.searchRecursively = searchRecursively;
         this.directoryFilter = directoryFilter;
         this.candidateCollector = candidateCollector;
+        this.exportToOriginalFolder = exportToOriginalFolder;
     }
 
     @Override
@@ -53,12 +55,17 @@ public BiFunction<Path, List<String>, List<ModCandidate>> getCandidateCollector(
         return this.candidateCollector == null ? this::defaultCandidateCollector : this.candidateCollector;
     }
 
+    @Override
+    public boolean getExportToOriginalFolder() {
+        return this.exportToOriginalFolder;
+    }
+
     private List<ModCandidate> defaultCandidateCollector(Path modPath, List<String> fileList) {
         List<ModCandidate> candidates = new ArrayList<>();
 
         for (String file : fileList) {
             if (file.endsWith(".class")) {
-                candidates.add(new DefaultModCandidate(modPath));
+                candidates.add(new DefaultModCandidate(modPath, this));
                 break;
             }
         }
@@ -72,6 +79,7 @@ public static class BuilderImpl implements ModDiscovererConfig.Builder {
         private boolean searchRecursively = false;
         private Predicate<String> directoryFilter = s -> true;
         private BiFunction<Path, List<String>, List<ModCandidate>> candidateCollector;
+        private boolean exportToOriginalFolder = false;
 
         public BuilderImpl(String folderName) {
             this.folderName = folderName;
@@ -101,9 +109,15 @@ public Builder candidateCollector(BiFunction<Path, List<String>, List<ModCandida
             return this;
         }
 
+        @Override
+        public Builder exportToOriginalFolder(boolean exportToOriginalFolder) {
+            this.exportToOriginalFolder = exportToOriginalFolder;
+            return this;
+        }
+
         @Override
         public ModDiscovererConfig build() {
-            return new ModDiscovererConfigImpl(folderName, Pattern.compile(fileNameMatcher), searchRecursively, directoryFilter, candidateCollector);
+            return new ModDiscovererConfigImpl(folderName, Pattern.compile(fileNameMatcher), searchRecursively, directoryFilter, candidateCollector, exportToOriginalFolder);
         }
     }
 }

src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/ModRemappingAPIImpl.java

@@ -45,10 +45,13 @@ public static void init() {
 
             List<String> v2Keys = new ArrayList<>(v2Remappers.keySet());
 
-            for (String contextKey : v2Keys) {
+            while (!v2Keys.isEmpty()) {
+                String contextKey = v2Keys.remove(0);
                 ModRemmaperV2Context context = new ModRemmaperV2Context(contextKey, v2Remappers.get(contextKey));
                 CURRENT_CONTEXT = context;
 
+                CURRENT_CONTEXT.init();
+
                 Map<String, List<ModRemapper>> newRemappers = context.discoverMods(remapClassEdits)
                         .stream().collect(Collectors.groupingBy(ModRemapper::getContextId));