One mapping registry per context

Author: thecatcore

src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/api/MappingUtils.java

@@ -38,7 +38,7 @@ static String unmapClass(String className) {
      */
     @Deprecated
     static MappingUtils.ClassMember mapField(String className, String fieldName, @Nullable String fieldDesc) {
-        return MappingsUtilsImpl.mapField(className, fieldName, fieldDesc);
+        return MappingsUtilsImpl.mapField(MappingsUtilsImpl.getV1Registry(), className, fieldName, fieldDesc);
     }
 
     /**
@@ -50,7 +50,7 @@ static MappingUtils.ClassMember mapField(String className, String fieldName, @Nu
      */
     @Deprecated
     static MappingUtils.ClassMember mapFieldFromRemappedClass(String className, String fieldName, @Nullable String fieldDesc) {
-        return MappingsUtilsImpl.mapFieldFromRemappedClass(className, fieldName, fieldDesc);
+        return MappingsUtilsImpl.mapFieldFromRemappedClass(MappingsUtilsImpl.getV1Registry(), className, fieldName, fieldDesc);
     }
 
     /**
@@ -62,7 +62,7 @@ static MappingUtils.ClassMember mapFieldFromRemappedClass(String className, Stri
      */
     @Deprecated
     static MappingUtils.ClassMember mapMethod(String className, String methodName, String methodDesc) {
-        return MappingsUtilsImpl.mapMethod(className, methodName, methodDesc);
+        return MappingsUtilsImpl.mapMethod(MappingsUtilsImpl.getV1Registry(), className, methodName, methodDesc);
     }
 
     /**
@@ -74,7 +74,7 @@ static MappingUtils.ClassMember mapMethod(String className, String methodName, S
      */
     @Deprecated
     static MappingUtils.ClassMember mapMethodFromRemappedClass(String className, String methodName, String methodDesc) {
-        return MappingsUtilsImpl.mapMethodFromRemappedClass(className, methodName, methodDesc);
+        return MappingsUtilsImpl.mapMethodFromRemappedClass(MappingsUtilsImpl.getV1Registry(), className, methodName, methodDesc);
     }
 
     /**
@@ -85,7 +85,7 @@ static MappingUtils.ClassMember mapMethodFromRemappedClass(String className, Str
      */
     @Deprecated
     static MappingUtils.ClassMember mapField(Class<?> owner, String fieldName) {
-        return MappingsUtilsImpl.mapField(owner, fieldName);
+        return MappingsUtilsImpl.mapField(MappingsUtilsImpl.getV1Registry(), owner, fieldName);
     }
 
     /**
@@ -97,7 +97,7 @@ static MappingUtils.ClassMember mapField(Class<?> owner, String fieldName) {
      */
     @Deprecated
     static MappingUtils.ClassMember mapMethod(Class<?> owner, String methodName, Class<?>[] parameterTypes) {
-        return MappingsUtilsImpl.mapMethod(owner, methodName, parameterTypes);
+        return MappingsUtilsImpl.mapMethod(MappingsUtilsImpl.getV1Registry(), owner, methodName, parameterTypes);
     }
 
     /**

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

@@ -11,7 +11,7 @@ public interface MappingUtils {
      * @return remapped class name
      */
     static String mapClass(String className) {
-        return MappingsUtilsImpl.mapClass(className);
+        return MappingsUtilsImpl.mapClass(MappingsUtilsImpl.getV1Registry(), className);
     }
 
     /**
@@ -20,7 +20,7 @@ static String mapClass(String className) {
      * @return original class name
      */
     static String unmapClass(String className) {
-        return MappingsUtilsImpl.unmapClass(className);
+        return MappingsUtilsImpl.unmapClass(MappingsUtilsImpl.getV1Registry(), className);
     }
 
     /**
@@ -31,7 +31,7 @@ static String unmapClass(String className) {
      * @return
      */
     static ClassMember mapField(String className, String fieldName, @Nullable String fieldDesc) {
-        return MappingsUtilsImpl.mapField(className, fieldName, fieldDesc);
+        return MappingsUtilsImpl.mapField(MappingsUtilsImpl.getV1Registry(), className, fieldName, fieldDesc);
     }
 
     /**
@@ -42,7 +42,7 @@ static ClassMember mapField(String className, String fieldName, @Nullable String
      * @return
      */
     static ClassMember mapFieldFromRemappedClass(String className, String fieldName, @Nullable String fieldDesc) {
-        return MappingsUtilsImpl.mapFieldFromRemappedClass(className, fieldName, fieldDesc);
+        return MappingsUtilsImpl.mapFieldFromRemappedClass(MappingsUtilsImpl.getV1Registry(), className, fieldName, fieldDesc);
     }
 
     /**
@@ -53,7 +53,7 @@ static ClassMember mapFieldFromRemappedClass(String className, String fieldName,
      * @return
      */
     static ClassMember mapMethod(String className, String methodName, String methodDesc) {
-        return MappingsUtilsImpl.mapMethod(className, methodName, methodDesc);
+        return MappingsUtilsImpl.mapMethod(MappingsUtilsImpl.getV1Registry(), className, methodName, methodDesc);
     }
 
     /**
@@ -64,15 +64,15 @@ static ClassMember mapMethod(String className, String methodName, String methodD
      * @return
      */
     static ClassMember mapMethodFromRemappedClass(String className, String methodName, String methodDesc) {
-        return MappingsUtilsImpl.mapMethodFromRemappedClass(className, methodName, methodDesc);
+        return MappingsUtilsImpl.mapMethodFromRemappedClass(MappingsUtilsImpl.getV1Registry(), className, methodName, methodDesc);
     }
 
     static ClassMember mapField(Class<?> owner, String fieldName) {
-        return MappingsUtilsImpl.mapField(owner, fieldName);
+        return MappingsUtilsImpl.mapField(MappingsUtilsImpl.getV1Registry(), owner, fieldName);
     }
 
     static ClassMember mapMethod(Class<?> owner, String methodName, Class<?>[] parameterTypes) {
-        return MappingsUtilsImpl.mapMethod(owner, methodName, parameterTypes);
+        return MappingsUtilsImpl.mapMethod(MappingsUtilsImpl.getV1Registry(), owner, methodName, parameterTypes);
     }
 
     /**
@@ -81,7 +81,7 @@ static ClassMember mapMethod(Class<?> owner, String methodName, Class<?>[] param
      * @return remapped descriptor
      */
     static String mapDescriptor(String desc) {
-        return MappingsUtilsImpl.mapDescriptor(desc);
+        return MappingsUtilsImpl.mapDescriptor(MappingsUtilsImpl.getV1Registry(), desc);
     }
 
     class ClassMember {

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

@@ -20,14 +20,14 @@
 public class LibraryHandler {
     private static final Map<RemapLibrary, Path> remapLibraries = new HashMap<>();
 
-    public static void gatherRemapLibraries(List<ModRemapper> remappers) {
+    public static void gatherRemapLibraries(List<ModRemapper> remappers, String sourceNamespace) {
         try {
             for (ModRemapper remapper : remappers) {
                 List<RemapLibrary> libraries = new ArrayList<>();
 
                 remapper.addRemapLibraries(libraries, FabricLoader.getInstance().getEnvironmentType());
 
-                Map<RemapLibrary, Path> temp = CacheUtils.computeExtraLibraryPaths(libraries, MappingsUtilsImpl.getSourceNamespace());
+                Map<RemapLibrary, Path> temp = CacheUtils.computeExtraLibraryPaths(libraries, sourceNamespace);
 
                 for (Map.Entry<RemapLibrary, Path> entry : temp.entrySet()) {
                     RemapLibrary library = entry.getKey();