Allow using MRAPI in dev workspace once again.

FabricCompatibilityLayers · Jun 1, 2024 · 860814a · 860814a
1 parent 2e4e042
commit 860814a
Showing 1 changed file with 23 additions and 6 deletions.
diff --git a/src/main/java/fr/catcore/modremapperapi/utils/MappingsUtils.java b/src/main/java/fr/catcore/modremapperapi/utils/MappingsUtils.java
@@ -30,7 +30,7 @@ public static String getNativeNamespace() {
     }
 
     public static String getTargetNamespace() {
-        return !FabricLoader.getInstance().isDevelopmentEnvironment() ? "intermediary" : FabricLoader.getInstance().getMappingResolver().getCurrentRuntimeNamespace();
+        return FabricLoader.getInstance().getMappingResolver().getCurrentRuntimeNamespace();
     }
 
     public static MappingTree loadMappings(Reader reader) {
@@ -60,10 +60,6 @@ public static IMappingProvider createProvider(MappingTree mappings) {
         return MappingsUtilsImpl.createProvider(mappings, getNativeNamespace(), getTargetNamespace());
     }
 
-    private static IMappingProvider createBackwardProvider(MappingTree mappings) {
-        return MappingsUtilsImpl.createProvider(mappings, getTargetNamespace(), "official");
-    }
-
     private static Path[] getMinecraftJar(List<Path> sourcePaths, String src, String target) throws IOException {
         Path[] originalClassPath = sourcePaths.toArray(new Path[0]);
 
@@ -109,7 +105,28 @@ private static Path[] getMinecraftJar(List<Path> sourcePaths, String src, String
     public static void addMinecraftJar(TinyRemapper remapper) throws IOException {
         if (FabricLoader.getInstance().isDevelopmentEnvironment()) {
             try {
-                remapper.readClassPathAsync(getMinecraftJar(getRemapClasspath(), getTargetNamespace(), "official"));
+                Path[] classPath = getMinecraftJar(
+                        Arrays.asList(
+                                getMinecraftJar(
+                                        getRemapClasspath(),
+                                        getTargetNamespace(),
+                                        "intermediary"
+                                )
+                        ),
+                        "intermediary",
+                        "official"
+                );
+
+                remapper.readClassPathAsync(
+                        !Objects.equals(MappingsUtilsImpl.getSourceNamespace(), "official") ?
+                            getMinecraftJar(
+                                    Arrays.asList(
+                                            classPath
+                                    ),
+                                    "official",
+                                    MappingsUtilsImpl.getSourceNamespace()
+                            ) : classPath
+                );
             } catch (IOException e) {
                 throw new RuntimeException("Failed to populate default remap classpath", e);
             }