Fix tests

thecatcore · thecatcore · commit cf38057da1e3 · 2025-03-27T15:49:39.000+01:00
diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/MappingsUtilsImpl.java b/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/MappingsUtilsImpl.java
@@ -15,13 +15,6 @@
 
 @ApiStatus.Internal
 public class MappingsUtilsImpl {
-    private static String sourceNamespace = "official";
-
-    @ApiStatus.Internal
-    public static String getSourceNamespace() {
-        return sourceNamespace;
-    }
-
     public static String getTargetNamespace() {
         return FabricLoader.getInstance().getMappingResolver().getCurrentRuntimeNamespace();
     }
diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/MappingsRegistryInstance.java b/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/MappingsRegistryInstance.java
@@ -21,8 +21,8 @@
 
 public class MappingsRegistryInstance extends MappingsRegistry {
     public List<String> vanillaClassNames = new ArrayList<>();
-    private final MemoryMappingTree formatted = new MemoryMappingTree();
-    private final MemoryMappingTree mods, additional;
+    private MemoryMappingTree formatted = new MemoryMappingTree();
+    private MemoryMappingTree mods, additional;
     private final MemoryMappingTree full = new MemoryMappingTree();
 
     private String defaultPackage = "";
@@ -33,8 +33,8 @@ public MappingsRegistryInstance() {
 
         try {
             this.formatVanillaMappings();
-            mods = MappingTreeHelper.createMappingTree();
-            additional = MappingTreeHelper.createMappingTree();
+            mods = MappingTreeHelper.createMappingTree(this.sourceNamespace, getTargetNamespace());
+            additional = MappingTreeHelper.createMappingTree(this.sourceNamespace, getTargetNamespace());
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
@@ -83,15 +83,15 @@ public MemoryMappingTree getFormattedMappings() {
     public void addToFormattedMappings(InputStream stream) throws IOException {
         MappingTree extra = MappingTreeHelper.readMappings(stream);
 
-        MappingTreeHelper.merge(formatted, extra);
+        formatted = MappingTreeHelper.mergeIntoNew(formatted, extra);
     }
 
     @Override
     public void completeFormattedMappings() throws IOException {
         formatted.accept(full);
 
         for (MappingTree.ClassMapping classView : formatted.getClasses()) {
-            String className = classView.getName(MappingsUtilsImpl.getSourceNamespace());
+            String className = classView.getName(this.getSourceNamespace());
 
             if (className != null) {
                 vanillaClassNames.add("/" + className + ".class");
@@ -172,6 +172,13 @@ public String getSourceNamespace() {
 
     public void setSourceNamespace(String sourceNamespace) {
         this.sourceNamespace = sourceNamespace;
+
+        try {
+            mods = MappingTreeHelper.createMappingTree(this.sourceNamespace, getTargetNamespace());
+            additional = MappingTreeHelper.createMappingTree(this.sourceNamespace, getTargetNamespace());
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     @Override
diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/ModRemapperContext.java b/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/ModRemapperContext.java
@@ -1,6 +1,7 @@
 package io.github.fabriccompatibiltylayers.modremappingapi.impl.context;
 
 import io.github.fabriccompatibiltylayers.modremappingapi.impl.mappings.MappingsRegistry;
+import net.fabricmc.tinyremapper.TinyRemapper;
 
 import java.nio.file.Path;
 import java.util.List;
@@ -14,4 +15,5 @@ public interface ModRemapperContext {
     void gatherRemappers();
     Map<String, List<String>> getMixin2TargetMap();
     MappingsRegistry getMappingsRegistry();
+    void addToRemapperBuilder(TinyRemapper.Builder builder);
 }
diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/v1/ModRemapperV1Context.java b/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/v1/ModRemapperV1Context.java
@@ -3,16 +3,14 @@
 import fr.catcore.modremapperapi.utils.Constants;
 import io.github.fabriccompatibiltylayers.modremappingapi.api.v1.MappingBuilder;
 import io.github.fabriccompatibiltylayers.modremappingapi.api.v1.ModRemapper;
-import io.github.fabriccompatibiltylayers.modremappingapi.impl.LibraryHandler;
-import io.github.fabriccompatibiltylayers.modremappingapi.impl.MappingBuilderImpl;
-import io.github.fabriccompatibiltylayers.modremappingapi.impl.MappingsUtilsImpl;
-import io.github.fabriccompatibiltylayers.modremappingapi.impl.ModDiscoverer;
+import io.github.fabriccompatibiltylayers.modremappingapi.impl.*;
 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.mappings.MappingsRegistry;
 import io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.ModTrRemapper;
 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;
@@ -82,9 +80,9 @@ public void init() {
     public void remapMods(Map<Path, Path> pathMap) {
         Constants.MAIN_LOGGER.debug("Starting jar remapping!");
         SoftLockFixer.preloadClasses();
-        TinyRemapper remapper = ModTrRemapper.makeRemapper(remappers);
+        TinyRemapper remapper = ModTrRemapper.makeRemapper(this);
         Constants.MAIN_LOGGER.debug("Remapper created!");
-        ModTrRemapper.remapMods(remapper, pathMap);
+        ModTrRemapper.remapMods(remapper, pathMap, this.mappingsRegistry);
         Constants.MAIN_LOGGER.debug("Jar remapping done!");
 
         this.mappingsRegistry.writeFullMappings();
@@ -131,4 +129,18 @@ private void registerAdditionalMappings() {
             remapper.registerMappings(builder);
         }
     }
+
+    @Override
+    public void addToRemapperBuilder(TinyRemapper.Builder builder) {
+        VisitorInfosImpl preInfos = new VisitorInfosImpl();
+        VisitorInfosImpl postInfos = new VisitorInfosImpl();
+
+        for (ModRemapper modRemapper : remappers) {
+            modRemapper.registerPreVisitors(preInfos);
+            modRemapper.registerPostVisitors(postInfos);
+        }
+
+        builder.extraPreApplyVisitor(new MRAApplyVisitor(preInfos));
+        builder.extraPostApplyVisitor(new MRAApplyVisitor(postInfos));
+    }
 }
diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/mappings/MappingTreeHelper.java b/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/mappings/MappingTreeHelper.java
@@ -1,6 +1,6 @@
 package io.github.fabriccompatibiltylayers.modremappingapi.impl.mappings;
 
-import io.github.fabriccompatibiltylayers.modremappingapi.impl.MappingsUtilsImpl;
+import io.github.fabriccompatibiltylayers.modremappingapi.impl.ModRemappingAPIImpl;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.impl.util.log.Log;
 import net.fabricmc.loader.impl.util.log.LogCategory;
@@ -33,7 +33,9 @@
 public class MappingTreeHelper {
 
     @ApiStatus.Internal
-    public static void mergeIntoNew(VisitableMappingTree result, MappingTree left, MappingTree right) throws IOException {
+    public static MemoryMappingTree mergeIntoNew(MappingTree left, MappingTree right) throws IOException {
+        MemoryMappingTree result = new MemoryMappingTree();
+
         if (!Objects.equals(left.getSrcNamespace(), right.getSrcNamespace())) {
             throw new RuntimeException("Source namespace mismatch!");
         }
@@ -58,6 +60,8 @@ public static void mergeIntoNew(VisitableMappingTree result, MappingTree left, M
 
         reorderedLeft.accept(result, VisitOrder.createByName());
         reorderedRight.accept(result, VisitOrder.createByName());
+
+        return result;
     }
 
     @ApiStatus.Internal
@@ -71,7 +75,7 @@ public static void merge(VisitableMappingTree main, MappingTree additional) thro
                 List<String> dstNamespaces = new ArrayList<>(additional.getDstNamespaces());
                 dstNamespaces.add(main.getSrcNamespace());
 
-                visitor = new MappingDstNsReorder(reorder, dstNamespaces);
+                visitor = new MappingDstNsReorder(visitor, dstNamespaces);
             }
 
             additional.accept(visitor);
@@ -122,7 +126,9 @@ public static IMappingProvider createMappingProvider(MappingTree mappings, Strin
 
     @ApiStatus.Internal
     public static MemoryMappingTree createMappingTree() throws IOException {
-        return createMappingTree(MappingsUtilsImpl.getSourceNamespace(), MappingsUtilsImpl.getTargetNamespace());
+        MappingsRegistry registry = ModRemappingAPIImpl.getCurrentContext().getMappingsRegistry();
+
+        return createMappingTree(registry.getSourceNamespace(), registry.getTargetNamespace());
     }
 
     @ApiStatus.Internal
diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/ModTrRemapper.java b/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/ModTrRemapper.java
@@ -5,6 +5,7 @@
 import io.github.fabriccompatibiltylayers.modremappingapi.impl.MappingsUtilsImpl;
 import io.github.fabriccompatibiltylayers.modremappingapi.impl.ModRemappingAPIImpl;
 import io.github.fabriccompatibiltylayers.modremappingapi.impl.VisitorInfosImpl;
+import io.github.fabriccompatibiltylayers.modremappingapi.impl.context.ModRemapperContext;
 import io.github.fabriccompatibiltylayers.modremappingapi.impl.mappings.MappingTreeHelper;
 import io.github.fabriccompatibiltylayers.modremappingapi.impl.mappings.MappingsRegistry;
 import io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.minecraft.MinecraftRemapper;
@@ -25,7 +26,7 @@
 
 @ApiStatus.Internal
 public class ModTrRemapper {
-    public static TinyRemapper makeRemapper(List<ModRemapper> remappers) {
+    public static TinyRemapper makeRemapper(ModRemapperContext context) {
         MappingsRegistry mappingsRegistry = ModRemappingAPIImpl.getCurrentContext().getMappingsRegistry();
 
         List<MappingTree> trees = Arrays.asList(
@@ -44,28 +45,13 @@ public static TinyRemapper makeRemapper(List<ModRemapper> remappers) {
         }
 
         for (MappingTree tree : trees) {
-            builder.withMappings(MappingTreeHelper.createMappingProvider(tree, MappingsUtilsImpl.getSourceNamespace(), MappingsUtilsImpl.getTargetNamespace()));
+            builder.withMappings(MappingTreeHelper.createMappingProvider(tree, context.getMappingsRegistry().getSourceNamespace(), context.getMappingsRegistry().getTargetNamespace()));
         }
 
-        MRAApplyVisitor preApplyVisitor = new MRAApplyVisitor();
-        MRAApplyVisitor postApplyVisitor = new MRAApplyVisitor();
-        MixinPostApplyVisitor mixinPostApplyVisitor = new MixinPostApplyVisitor();
-
-        VisitorInfosImpl preInfos = new VisitorInfosImpl();
-        VisitorInfosImpl postInfos = new VisitorInfosImpl();
-
-        for (ModRemapper modRemapper : remappers) {
-            modRemapper.registerPreVisitors(preInfos);
-            modRemapper.registerPostVisitors(postInfos);
-        }
+        context.addToRemapperBuilder(builder);
 
-        preApplyVisitor.setInfos(preInfos);
-        postApplyVisitor.setInfos(postInfos);
-
-        builder.extraPreApplyVisitor(preApplyVisitor);
-        builder.extraPostApplyVisitor(postApplyVisitor);
+        MixinPostApplyVisitor mixinPostApplyVisitor = new MixinPostApplyVisitor();
         builder.extraPostApplyVisitor(mixinPostApplyVisitor);
-
         builder.extension(new MixinExtension(EnumSet.of(MixinExtension.AnnotationTarget.HARD)));
 
         TinyRemapper remapper = builder.build();
@@ -81,12 +67,12 @@ public static TinyRemapper makeRemapper(List<ModRemapper> remappers) {
         return remapper;
     }
 
-    public static void remapMods(TinyRemapper remapper, Map<Path, Path> paths) {
+    public static void remapMods(TinyRemapper remapper, Map<Path, Path> paths, MappingsRegistry mappingsRegistry) {
         List<OutputConsumerPath> outputConsumerPaths = new ArrayList<>();
 
         List<OutputConsumerPath.ResourceRemapper> resourceRemappers = new ArrayList<>(NonClassCopyMode.FIX_META_INF.remappers);
         resourceRemappers.add(new RefmapRemapper());
 
-        TrRemapperHelper.applyRemapper(remapper, paths, outputConsumerPaths, resourceRemappers, true, MappingsUtilsImpl.getSourceNamespace(), MappingsUtilsImpl.getTargetNamespace());
+        TrRemapperHelper.applyRemapper(remapper, paths, outputConsumerPaths, resourceRemappers, true, mappingsRegistry.getSourceNamespace(), mappingsRegistry.getTargetNamespace());
     }
 }
diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/SoftLockFixer.java b/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/SoftLockFixer.java
@@ -81,7 +81,6 @@ public static void preloadClasses() {
                 "io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.resource.RefmapRemapper",
                 "io.github.fabriccompatibiltylayers.modremappingapi.impl.mappings.MappingsRegistry",
                 "io.github.fabriccompatibiltylayers.modremappingapi.impl.mappings.MappingTreeHelper",
-                "io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.MixinRemappingHelper",
                 "io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.ModTrRemapper",
                 "io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.TrRemapperHelper",
 
diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/minecraft/MinecraftRemapper.java b/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/minecraft/MinecraftRemapper.java
@@ -30,7 +30,7 @@ private static Collection<Path> getMinecraftJar(Collection<Path> sourcePaths, St
             Files.createDirectories(targetFolder);
         }
 
-        Map<Path, Path> paths = CacheUtils.computeLibraryPaths(sourcePaths, target);
+        Map<Path, Path> paths = CacheUtils.computeLibraryPaths(new HashSet<>(sourcePaths), target);
 
         if (FileUtils.exist(paths.values())) return paths.values();
 
diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/visitor/MRAApplyVisitor.java b/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/visitor/MRAApplyVisitor.java
@@ -7,15 +7,15 @@
 import org.objectweb.asm.ClassVisitor;
 
 public class MRAApplyVisitor implements TinyRemapper.ApplyVisitorProvider {
-    private VisitorInfosImpl infos;
+    private final VisitorInfosImpl infos;
+
+    public MRAApplyVisitor(VisitorInfosImpl infos) {
+        this.infos = infos;
+    }
 
     @Override
     public ClassVisitor insertApplyVisitor(TrClass cls, ClassVisitor next) {
         final String className = cls.getName();
         return new MRAClassVisitor(next, infos, className);
     }
-
-    public void setInfos(VisitorInfosImpl infos) {
-        this.infos = infos;
-    }
 }
diff --git a/src/test/java/io/github/fabriccompatibiltylayers/modremappingapi/test/ModRemapperTests.java b/src/test/java/io/github/fabriccompatibiltylayers/modremappingapi/test/ModRemapperTests.java
@@ -1,6 +1,6 @@
 package io.github.fabriccompatibiltylayers.modremappingapi.test;
 
-import io.github.fabriccompatibiltylayers.modremappingapi.api.MappingUtils;
+import io.github.fabriccompatibiltylayers.modremappingapi.api.v1.MappingUtils;
 import net.fabricmc.loader.api.FabricLoader;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ private static Collection<Path> getMinecraftJar(Collection<Path> sourcePaths, St`
`30`	`30`	`Files.createDirectories(targetFolder);`
`31`	`31`	`}`
`32`	`32`
`33`		`- Map<Path, Path> paths = CacheUtils.computeLibraryPaths(sourcePaths, target);`
	`33`	`+ Map<Path, Path> paths = CacheUtils.computeLibraryPaths(new HashSet<>(sourcePaths), target);`
`34`	`34`
`35`	`35`	`if (FileUtils.exist(paths.values())) return paths.values();`
`36`	`36`