One library handler and mod discoverer per context

Author: thecatcore

src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/api/v1/ModRemapper.java

@@ -30,4 +30,12 @@ default Optional<String> getSourceNamespace() {
     default Optional<Supplier<InputStream>> getExtraMapping() {
         return Optional.empty();
     }
+
+    /**
+     * Whether to enable mixin remapping. Enabled by default for compatibility purposes.
+     * @return true - enabled <br> false - disabled
+     */
+    default boolean remapMixins() {
+        return true;
+    }
 }

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

@@ -3,7 +3,7 @@
 import java.nio.file.Path;
 
 public class DefaultModEntry extends ModEntry {
-    protected DefaultModEntry(String modName, Path file, Path original) {
+    public DefaultModEntry(String modName, Path file, Path original) {
         super(modName, modName, file, original);
     }
 

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

@@ -33,4 +33,9 @@ public void registerPreVisitors(VisitorInfos infos) {
     public void registerPostVisitors(VisitorInfos infos) {
 
     }
+
+    @Override
+    public boolean remapMixins() {
+        return false;
+    }
 }

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

@@ -18,9 +18,27 @@
 import java.util.Map;
 
 public class LibraryHandler {
-    private static final Map<RemapLibrary, Path> remapLibraries = new HashMap<>();
+    private final Map<RemapLibrary, Path> remapLibraries = new HashMap<>();
 
-    public static void gatherRemapLibraries(List<ModRemapper> remappers, String sourceNamespace) {
+    private String sourceNamespace;
+
+    public LibraryHandler() {}
+
+    public void init(String sourceNamespace) {
+        this.sourceNamespace = sourceNamespace;
+
+        Path sourceLibraryPath = CacheUtils.getLibraryPath(this.sourceNamespace);
+
+        if (!Files.exists(sourceLibraryPath)) {
+            try {
+                Files.createDirectories(sourceLibraryPath);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    public void gatherRemapLibraries(List<ModRemapper> remappers) {
         try {
             for (ModRemapper remapper : remappers) {
                 List<RemapLibrary> libraries = new ArrayList<>();
@@ -54,7 +72,7 @@ public static void gatherRemapLibraries(List<ModRemapper> remappers, String sour
         }
     }
 
-    public static void addLibrariesToRemapClasspath(TinyRemapper remapper) {
+    public void addLibrariesToRemapClasspath(TinyRemapper remapper) {
         for (Path libPath : remapLibraries.values()) {
             if (Files.exists(libPath)) {
                 remapper.readClassPathAsync(libPath);

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

@@ -194,4 +194,13 @@ public void writeFullMappings() {
             throw new RuntimeException(e);
         }
     }
+
+    @Override
+    public List<MappingTree> getRemappingMappings() {
+        return Arrays.asList(
+                this.getFormattedMappings(),
+                this.getModsMappings(),
+                this.getAdditionalMappings()
+        );
+    }
 }

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

@@ -1,11 +1,14 @@
 package io.github.fabriccompatibiltylayers.modremappingapi.impl.context;
 
+import io.github.fabriccompatibiltylayers.modremappingapi.impl.LibraryHandler;
 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.List;
 import java.util.Map;
+import java.util.Set;
 
 public interface ModRemapperContext {
     void init();
@@ -16,4 +19,6 @@ public interface ModRemapperContext {
     Map<String, List<String>> getMixin2TargetMap();
     MappingsRegistry getMappingsRegistry();
     void addToRemapperBuilder(TinyRemapper.Builder builder);
+    Set<RemappingFlags> getRemappingFlags();
+    LibraryHandler getLibraryHandler();
 }

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

@@ -9,28 +9,30 @@
 import io.github.fabriccompatibiltylayers.modremappingapi.impl.context.MappingsRegistryInstance;
 import io.github.fabriccompatibiltylayers.modremappingapi.impl.mappings.MappingsRegistry;
 import io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.ModTrRemapper;
+import io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.RemappingFlags;
 import io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.SoftLockFixer;
 import io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.visitor.MRAApplyVisitor;
-import io.github.fabriccompatibiltylayers.modremappingapi.impl.utils.CacheUtils;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.tinyremapper.TinyRemapper;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.*;
 import java.util.function.Supplier;
 
 public class ModRemapperV1Context extends BaseModRemapperContext {
+    private final Set<RemappingFlags> remapFlags = new HashSet<>();
     private final List<ModRemapper> remappers = new ArrayList<>();
     private final Map<String, List<String>> mixin2TargetMap = new HashMap<>();
     private final MappingsRegistryInstance mappingsRegistry = new MappingsRegistryInstance();
+    private final LibraryHandler libraryHandler = new LibraryHandler();
+    private final V1ModDiscoverer modDiscoverer = new V1ModDiscoverer();
 
     public static ModRemapperV1Context INSTANCE;
 
     public ModRemapperV1Context() {
-        super("mod-remapping-api:v1");
+        super("mod-remapping-api_v1");
         INSTANCE = this;
     }
 
@@ -53,6 +55,10 @@ public void init() {
                     throw new RuntimeException(e);
                 }
             });
+
+            if (remapper.remapMixins()) {
+                remapFlags.add(RemappingFlags.MIXIN);
+            }
         }
 
         try {
@@ -61,17 +67,9 @@ public void init() {
             throw new RuntimeException(e);
         }
 
-        Path sourceLibraryPath = CacheUtils.getLibraryPath(this.mappingsRegistry.getSourceNamespace());
-
-        if (!Files.exists(sourceLibraryPath)) {
-            try {
-                Files.createDirectories(sourceLibraryPath);
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        }
+        libraryHandler.init(this.mappingsRegistry.getSourceNamespace());
 
-        LibraryHandler.gatherRemapLibraries(remappers, this.mappingsRegistry.getSourceNamespace());
+        libraryHandler.gatherRemapLibraries(remappers);
 
         this.registerAdditionalMappings();
         this.mappingsRegistry.generateAdditionalMappings();
@@ -95,7 +93,7 @@ public void afterRemap() {
 
     @Override
     public void discoverMods(boolean remapClassEdits) {
-        ModDiscoverer.init(remappers, remapClassEdits, this);
+        this.modDiscoverer.init(remappers, remapClassEdits, this);
     }
 
     private static final String v0EntrypointName = "mod-remapper-api:modremapper";
@@ -143,4 +141,14 @@ public void addToRemapperBuilder(TinyRemapper.Builder builder) {
         builder.extraPreApplyVisitor(new MRAApplyVisitor(preInfos));
         builder.extraPostApplyVisitor(new MRAApplyVisitor(postInfos));
     }
+
+    @Override
+    public Set<RemappingFlags> getRemappingFlags() {
+        return remapFlags;
+    }
+
+    @Override
+    public LibraryHandler getLibraryHandler() {
+        return libraryHandler;
+    }
 }