Some work on the mod discovery api

Author: thecatcore

build.gradle

@@ -58,7 +58,7 @@ dependencies {
 
 	implementation(include("io.github.llamalad7:mixinextras-fabric:${project.mixin_extras_version}"))
 	implementation(include("com.github.thecatcore.CursedMixinExtensions:fabric:1.0.0"))
-	implementation(include("com.github.thecatcore:WFVAIO:1.1.0"))
+	implementation(include("com.github.thecatcore:WFVAIO:1.2.0"))
 
 	testImplementation "net.fabricmc:fabric-loader-junit:${project.loader_version}"
 }

gradle.properties

@@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 	minecraft_version = 1.6.4
 	yarn_build = 458
-	loader_version = 0.15.10
+	loader_version = 0.16.11
 	fabric_version = 1.9.1+1.12.2
 	mixin_extras_version=0.2.1
 	spasm_version=0.2

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

@@ -0,0 +1,13 @@
+package io.github.fabriccompatibilitylayers.modremappingapi.api.v2;
+
+import org.jetbrains.annotations.Nullable;
+
+import java.nio.file.Path;
+
+public interface ModCandidate {
+    String getId();
+    Path getPath();
+    String getType();
+    @Nullable String getAccessWidenerPath();
+    @Nullable ModCandidate getParent();
+}

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

@@ -1,25 +1,30 @@
 package io.github.fabriccompatibilitylayers.modremappingapi.api.v2;
 
-import io.github.fabriccompatibilitylayers.modremappingapi.impl.ModDiscovererImpl;
+import io.github.fabriccompatibilitylayers.modremappingapi.impl.ModDiscovererConfigImpl;
 
+import java.nio.file.Path;
+import java.util.List;
+import java.util.function.BiFunction;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-public interface ModDiscoverer {
+public interface ModDiscovererConfig {
     static Builder builder(String folderName) {
-        return new ModDiscovererImpl.BuilderImpl(folderName);
+        return new ModDiscovererConfigImpl.BuilderImpl(folderName);
     }
 
     String getFolderName();
     Pattern getFileNameMatcher();
     boolean searchRecursively();
     Predicate<String> getDirectoryFilter();
+    BiFunction<Path, List<String>, List<ModCandidate>> getCandidateCollector();
 
     interface Builder {
         Builder fileNameMatcher(String pattern);
         Builder searchRecursively(boolean searchRecursively);
         Builder directoryFilter(Predicate<String> filter);
+        Builder candidateCollector(BiFunction<Path, List<String>, List<ModCandidate>> collector);
 
-        ModDiscoverer build();
+        ModDiscovererConfig build();
     }
 }

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

@@ -5,5 +5,6 @@
 public interface ModRemapper {
     String getContextId();
 
-    List<ModDiscoverer> getModDiscoverers();
+    List<ModDiscovererConfig> getModDiscoverers();
+    List<ModRemapper> collectSubRemappers(List<ModCandidate> discoveredMods);
 }

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

@@ -0,0 +1,41 @@
+package io.github.fabriccompatibilitylayers.modremappingapi.impl;
+
+import io.github.fabriccompatibilitylayers.modremappingapi.api.v2.ModCandidate;
+import org.jetbrains.annotations.Nullable;
+
+import java.nio.file.Path;
+
+public class DefaultModCandidate implements ModCandidate {
+    private final String id;
+    private final Path path;
+
+    public DefaultModCandidate(Path path) {
+        this.id = path.getFileName().toString().replace(".jar", "").replace(".zip", "").replace(" ", "_");
+        this.path = path;
+    }
+
+    @Override
+    public String getId() {
+        return id;
+    }
+
+    @Override
+    public Path getPath() {
+        return path;
+    }
+
+    @Override
+    public String getType() {
+        return "default";
+    }
+
+    @Override
+    public @Nullable String getAccessWidenerPath() {
+        return null;
+    }
+
+    @Override
+    public @Nullable ModCandidate getParent() {
+        return null;
+    }
+}

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

@@ -0,0 +1,109 @@
+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.ApiStatus;
+import org.jetbrains.annotations.Nullable;
+
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.BiFunction;
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
+
+@ApiStatus.Internal
+public class ModDiscovererConfigImpl implements ModDiscovererConfig {
+    private final String folderName;
+    private final Pattern fileNameMatcher;
+    private final boolean searchRecursively;
+    private final Predicate<String> directoryFilter;
+    private final @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) {
+        this.folderName = folderName;
+        this.fileNameMatcher = fileNameMatcher;
+        this.searchRecursively = searchRecursively;
+        this.directoryFilter = directoryFilter;
+        this.candidateCollector = candidateCollector;
+    }
+
+    @Override
+    public String getFolderName() {
+        return folderName;
+    }
+
+    @Override
+    public Pattern getFileNameMatcher() {
+        return fileNameMatcher;
+    }
+
+    @Override
+    public boolean searchRecursively() {
+        return searchRecursively;
+    }
+
+    @Override
+    public Predicate<String> getDirectoryFilter() {
+        return directoryFilter;
+    }
+
+    @Override
+    public BiFunction<Path, List<String>, List<ModCandidate>> getCandidateCollector() {
+        return this.candidateCollector == null ? this::defaultCandidateCollector : this.candidateCollector;
+    }
+
+    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));
+                break;
+            }
+        }
+
+        return candidates;
+    }
+
+    public static class BuilderImpl implements ModDiscovererConfig.Builder {
+        private final String folderName;
+        private String fileNameMatcher = "(.+).jar$";
+        private boolean searchRecursively = false;
+        private Predicate<String> directoryFilter = s -> true;
+        private BiFunction<Path, List<String>, List<ModCandidate>> candidateCollector;
+
+        public BuilderImpl(String folderName) {
+            this.folderName = folderName;
+        }
+
+        @Override
+        public Builder fileNameMatcher(String pattern) {
+            this.fileNameMatcher = pattern;
+            return this;
+        }
+
+        @Override
+        public Builder searchRecursively(boolean searchRecursively) {
+            this.searchRecursively = searchRecursively;
+            return this;
+        }
+
+        @Override
+        public Builder directoryFilter(Predicate<String> filter) {
+            this.directoryFilter = filter;
+            return this;
+        }
+
+        @Override
+        public Builder candidateCollector(BiFunction<Path, List<String>, List<ModCandidate>> collector) {
+            this.candidateCollector = collector;
+            return this;
+        }
+
+        @Override
+        public ModDiscovererConfig build() {
+            return new ModDiscovererConfigImpl(folderName, Pattern.compile(fileNameMatcher), searchRecursively, directoryFilter, candidateCollector);
+        }
+    }
+}

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

@@ -63,7 +63,7 @@ public static void init() {
         }
     }
 
-    public static ModRemapperContext getCurrentContext() {
+    public static ModRemapperContext<?> getCurrentContext() {
         return CURRENT_CONTEXT;
     }
 }

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

@@ -1,5 +1,6 @@
 package io.github.fabriccompatibiltylayers.modremappingapi.impl.context.v2;
 
+import io.github.fabriccompatibilitylayers.modremappingapi.api.v2.ModDiscovererConfig;
 import io.github.fabriccompatibilitylayers.modremappingapi.api.v2.ModRemapper;
 import io.github.fabriccompatibiltylayers.modremappingapi.impl.LibraryHandler;
 import io.github.fabriccompatibiltylayers.modremappingapi.impl.ModCandidate;
@@ -42,9 +43,21 @@ public void afterRemap() {
 
     @Override
     public List<ModRemapper> discoverMods(boolean remapClassEdits) {
+        List<ModRemapper> collected = new ArrayList<>();
+        List<io.github.fabriccompatibilitylayers.modremappingapi.api.v2.ModCandidate> candidates = new ArrayList<>();
+
         for (ModRemapper remapper : remappers) {
+            for (ModDiscovererConfig config : remapper.getModDiscoverers()) {
+                V2ModDiscoverer discoverer = new V2ModDiscoverer(config);
+                candidates.addAll(discoverer.collect());
+            }
+        }
 
+        for (ModRemapper remapper : remappers) {
+            collected.addAll(remapper.collectSubRemappers(candidates));
         }
+
+        return collected;
     }
 
     @Override