Start working on V2 api

Author: thecatcore

src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/Dummy.java

@@ -0,0 +1,4 @@
+package io.github.fabriccompatibilitylayers.modremappingapi;
+
+public class Dummy {
+}

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

@@ -0,0 +1,25 @@
+package io.github.fabriccompatibilitylayers.modremappingapi.api.v2;
+
+import io.github.fabriccompatibilitylayers.modremappingapi.impl.ModDiscovererImpl;
+
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
+
+public interface ModDiscoverer {
+    static Builder builder(String folderName) {
+        return new ModDiscovererImpl.BuilderImpl(folderName);
+    }
+
+    String getFolderName();
+    Pattern getFileNameMatcher();
+    boolean searchRecursively();
+    Predicate<String> getDirectoryFilter();
+
+    interface Builder {
+        Builder fileNameMatcher(String pattern);
+        Builder searchRecursively(boolean searchRecursively);
+        Builder directoryFilter(Predicate<String> filter);
+
+        ModDiscoverer build();
+    }
+}

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

@@ -0,0 +1,9 @@
+package io.github.fabriccompatibilitylayers.modremappingapi.api.v2;
+
+import java.util.List;
+
+public interface ModRemapper {
+    String getContextId();
+
+    List<ModDiscoverer> getModDiscoverers();
+}

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

@@ -0,0 +1,76 @@
+package io.github.fabriccompatibilitylayers.modremappingapi.impl;
+
+import io.github.fabriccompatibilitylayers.modremappingapi.api.v2.ModDiscoverer;
+import org.jetbrains.annotations.ApiStatus;
+
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
+
+@ApiStatus.Internal
+public class ModDiscovererImpl implements ModDiscoverer {
+    private final String folderName;
+    private final Pattern fileNameMatcher;
+    private final boolean searchRecursively;
+    private final Predicate<String> directoryFilter;
+
+    private ModDiscovererImpl(String folderName, Pattern fileNameMatcher, boolean searchRecursively, Predicate<String> directoryFilter) {
+        this.folderName = folderName;
+        this.fileNameMatcher = fileNameMatcher;
+        this.searchRecursively = searchRecursively;
+        this.directoryFilter = directoryFilter;
+    }
+
+    @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;
+    }
+
+    public static class BuilderImpl implements ModDiscoverer.Builder {
+        private final String folderName;
+        private String fileNameMatcher = "(.+).jar$";
+        private boolean searchRecursively = false;
+        private Predicate<String> directoryFilter = s -> true;
+
+        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 ModDiscoverer build() {
+            return new ModDiscovererImpl(folderName, Pattern.compile(fileNameMatcher), searchRecursively, directoryFilter);
+        }
+    }
+}

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

@@ -2,11 +2,17 @@
 
 import fr.catcore.wfvaio.FabricVariants;
 import fr.catcore.wfvaio.WhichFabricVariantAmIOn;
+import io.github.fabriccompatibilitylayers.modremappingapi.api.v2.ModRemapper;
 import io.github.fabriccompatibiltylayers.modremappingapi.impl.context.ModRemapperContext;
 import io.github.fabriccompatibiltylayers.modremappingapi.impl.context.v1.ModRemapperV1Context;
+import io.github.fabriccompatibiltylayers.modremappingapi.impl.context.v2.ModRemmaperV2Context;
 import net.fabricmc.loader.api.FabricLoader;
 
 import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 public class ModRemappingAPIImpl {
     private static ModRemapperContext CURRENT_CONTEXT = null;
@@ -16,6 +22,7 @@ public class ModRemappingAPIImpl {
 
     private static boolean init = false;
     private static boolean initializing = false;
+    private static final String v2EntrypointName = "mod-remapper-api:modremapper_v2";
 
     public static void init() {
         if (!init && !initializing) {
@@ -32,6 +39,25 @@ public static void init() {
 
             CURRENT_CONTEXT.afterRemap();
 
+            Map<String, List<ModRemapper>> v2Remappers = FabricLoader.getInstance()
+                    .getEntrypoints(v2EntrypointName, ModRemapper.class)
+                    .stream().collect(Collectors.groupingBy(ModRemapper::getContextId));
+
+            List<String> v2Keys = new ArrayList<>(v2Remappers.keySet());
+
+            for (String contextKey : v2Keys) {
+                ModRemmaperV2Context context = new ModRemmaperV2Context(contextKey, v2Remappers.get(contextKey));
+                CURRENT_CONTEXT = context;
+
+                Map<String, List<ModRemapper>> newRemappers = context.discoverMods(remapClassEdits)
+                        .stream().collect(Collectors.groupingBy(ModRemapper::getContextId));
+
+                v2Keys.addAll(newRemappers.keySet());
+                v2Remappers.putAll(newRemappers);
+
+                context.afterRemap();
+            }
+
             initializing = false;
             init = true;
         }

src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/BaseModRemapperContext.java

@@ -3,7 +3,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public abstract class BaseModRemapperContext implements ModRemapperContext {
+public abstract class BaseModRemapperContext<T> implements ModRemapperContext<T> {
     private static final Map<String, ModRemapperContext> REGISTRY = new HashMap<>();
 
     public BaseModRemapperContext(String id) {

src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/ModRemapperContext.java

@@ -11,11 +11,11 @@
 import java.util.Map;
 import java.util.Set;
 
-public interface ModRemapperContext {
+public interface ModRemapperContext<T> {
     void init();
     void remapMods(Map<ModCandidate, Path> pathMap);
     void afterRemap();
-    void discoverMods(boolean remapClassEdits);
+    List<T> discoverMods(boolean remapClassEdits);
     void gatherRemappers();
     Map<String, List<String>> getMixin2TargetMap();
     MappingsRegistry getMappingsRegistry();

src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/v1/ModRemapperV1Context.java

@@ -7,6 +7,7 @@
 import io.github.fabriccompatibiltylayers.modremappingapi.impl.compatibility.V0ModRemapper;
 import io.github.fabriccompatibiltylayers.modremappingapi.impl.context.BaseModRemapperContext;
 import io.github.fabriccompatibiltylayers.modremappingapi.impl.context.MappingsRegistryInstance;
+import io.github.fabriccompatibiltylayers.modremappingapi.impl.context.ModRemapperContext;
 import io.github.fabriccompatibiltylayers.modremappingapi.impl.mappings.MappingsRegistry;
 import io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.ModTrRemapper;
 import io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.RemappingFlags;
@@ -22,7 +23,7 @@
 import java.util.*;
 import java.util.function.Supplier;
 
-public class ModRemapperV1Context extends BaseModRemapperContext {
+public class ModRemapperV1Context extends BaseModRemapperContext<ModRemapper> {
     private final Set<RemappingFlags> remapFlags = new HashSet<>();
     private final List<ModRemapper> remappers = new ArrayList<>();
     private final Map<String, List<String>> mixin2TargetMap = new HashMap<>();
@@ -93,7 +94,7 @@ public void afterRemap() {
     }
 
     @Override
-    public void discoverMods(boolean remapClassEdits) {
+    public List<ModRemapper> discoverMods(boolean remapClassEdits) {
         Map<ModCandidate, Path> modPaths = this.modDiscoverer.init(remappers, remapClassEdits, this);
 
         for (ModCandidate candidate : modPaths.keySet()) {
@@ -105,6 +106,8 @@ public void discoverMods(boolean remapClassEdits) {
         this.remapMods(modPaths);
 
         modPaths.values().forEach(FabricLauncherBase.getLauncher()::addToClassPath);
+
+        return new ArrayList<>();
     }
 
     private static final String v0EntrypointName = "mod-remapper-api:modremapper";

src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/v2/ModRemmaperV2Context.java

@@ -0,0 +1,83 @@
+package io.github.fabriccompatibiltylayers.modremappingapi.impl.context.v2;
+
+import io.github.fabriccompatibilitylayers.modremappingapi.api.v2.ModRemapper;
+import io.github.fabriccompatibiltylayers.modremappingapi.impl.LibraryHandler;
+import io.github.fabriccompatibiltylayers.modremappingapi.impl.ModCandidate;
+import io.github.fabriccompatibiltylayers.modremappingapi.impl.context.BaseModRemapperContext;
+import io.github.fabriccompatibiltylayers.modremappingapi.impl.context.MappingsRegistryInstance;
+import io.github.fabriccompatibiltylayers.modremappingapi.impl.context.ModRemapperContext;
+import io.github.fabriccompatibiltylayers.modremappingapi.impl.mappings.MappingsRegistry;
+import io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.RemappingFlags;
+import net.fabricmc.tinyremapper.TinyRemapper;
+
+import java.nio.file.Path;
+import java.util.*;
+
+public class ModRemmaperV2Context extends BaseModRemapperContext<ModRemapper> {
+    private final List<ModRemapper> remappers;
+    private final Set<RemappingFlags> remapFlags = new HashSet<>();
+    private final Map<String, List<String>> mixin2TargetMap = new HashMap<>();
+    private final MappingsRegistryInstance mappingsRegistry = new MappingsRegistryInstance();
+    private final LibraryHandler libraryHandler = new LibraryHandler();
+
+    public ModRemmaperV2Context(String id, List<ModRemapper> remappers) {
+        super(id);
+        this.remappers = remappers;
+    }
+
+    @Override
+    public void init() {
+
+    }
+
+    @Override
+    public void remapMods(Map<ModCandidate, Path> pathMap) {
+
+    }
+
+    @Override
+    public void afterRemap() {
+
+    }
+
+    @Override
+    public List<ModRemapper> discoverMods(boolean remapClassEdits) {
+        for (ModRemapper remapper : remappers) {
+
+        }
+    }
+
+    @Override
+    public void gatherRemappers() {
+
+    }
+
+    @Override
+    public Map<String, List<String>> getMixin2TargetMap() {
+        return mixin2TargetMap;
+    }
+
+    @Override
+    public MappingsRegistry getMappingsRegistry() {
+        return mappingsRegistry;
+    }
+
+    @Override
+    public void addToRemapperBuilder(TinyRemapper.Builder builder) {
+
+    }
+
+    @Override
+    public Set<RemappingFlags> getRemappingFlags() {
+        return remapFlags;
+    }
+
+    @Override
+    public LibraryHandler getLibraryHandler() {
+        return libraryHandler;
+    }
+
+    public List<ModRemapper> getRemappers() {
+        return remappers;
+    }
+}