Start work on remapping context

thecatcore · thecatcore · commit ffebb6e26170 · 2025-03-25T23:12:18.000+01:00
diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/ModDiscoverer.java b/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/ModDiscoverer.java
@@ -3,6 +3,7 @@
 import fr.catcore.modremapperapi.utils.Constants;
 import io.github.fabriccompatibiltylayers.modremappingapi.api.v1.ModRemapper;
 import io.github.fabriccompatibiltylayers.modremappingapi.impl.compatibility.V0ModRemapper;
+import io.github.fabriccompatibiltylayers.modremappingapi.impl.context.ModRemapperV1Context;
 import io.github.fabriccompatibiltylayers.modremappingapi.impl.mappings.MappingsRegistry;
 import io.github.fabriccompatibiltylayers.modremappingapi.impl.utils.CacheUtils;
 import io.github.fabriccompatibiltylayers.modremappingapi.impl.utils.FileUtils;
@@ -21,11 +22,7 @@
 public class ModDiscoverer {
     private static final Map<String, List<String>> EXCLUDED = new HashMap<>();
 
-    protected static void init(List<ModRemapper> modRemappers, boolean remapClassEdits) {
-        ModRemapperContext context = new ModRemapperContext(modRemappers);
-
-        context.init();
-
+    public static void init(List<ModRemapper> modRemappers, boolean remapClassEdits, ModRemapperV1Context context) {
         List<ModEntry> mods = new ArrayList<>();
 
         for (ModRemapper remapper : modRemappers) {
diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/ModRemappingAPIImpl.java b/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/ModRemappingAPIImpl.java
@@ -2,19 +2,14 @@
 
 import fr.catcore.wfvaio.FabricVariants;
 import fr.catcore.wfvaio.WhichFabricVariantAmIOn;
-import io.github.fabriccompatibiltylayers.modremappingapi.api.v1.ModRemapper;
-import io.github.fabriccompatibiltylayers.modremappingapi.impl.compatibility.V0ModRemapper;
+import io.github.fabriccompatibiltylayers.modremappingapi.impl.context.ModRemapperContext;
+import io.github.fabriccompatibiltylayers.modremappingapi.impl.context.ModRemapperV1Context;
 import net.fabricmc.loader.api.FabricLoader;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
 
 public class ModRemappingAPIImpl {
-
-    private static final String v0EntrypointName = "mod-remapper-api:modremapper";
-    private static final String v1EntrypointName = "mod-remapper-api:modremapper_v1";
-    private static final List<ModRemapper> modRemappers = new ArrayList<>();
+    private static ModRemapperContext CURRENT_CONTEXT = null;
     public static final boolean BABRIC = WhichFabricVariantAmIOn.getVariant() == FabricVariants.BABRIC || WhichFabricVariantAmIOn.getVariant() == FabricVariants.BABRIC_NEW_FORMAT;
 
     public static boolean remapClassEdits = false;
@@ -29,20 +24,20 @@ public static void init() {
             FabricLoader.getInstance().getConfigDir().toFile().mkdirs();
             remapClassEdits = new File(FabricLoader.getInstance().getConfigDir().toFile(), ".remapclassedits").exists();
 
-            FabricLoader.getInstance()
-                    .getEntrypoints(v0EntrypointName, fr.catcore.modremapperapi.api.ModRemapper.class)
-                    .stream()
-                    .map(V0ModRemapper::new)
-                    .forEach(modRemappers::add);
-
-            modRemappers.addAll(FabricLoader.getInstance().getEntrypoints(v1EntrypointName, ModRemapper.class));
+            CURRENT_CONTEXT = new ModRemapperV1Context();
+            CURRENT_CONTEXT.gatherRemappers();
 
-            ModDiscoverer.init(modRemappers, remapClassEdits);
+            CURRENT_CONTEXT.init();
+            CURRENT_CONTEXT.discoverMods(remapClassEdits);
 
-            modRemappers.forEach(ModRemapper::afterRemap);
+            CURRENT_CONTEXT.afterRemap();
 
             initializing = false;
             init = true;
         }
     }
+
+    public static ModRemapperContext getCurrentContext() {
+        return CURRENT_CONTEXT;
+    }
 }
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
@@ -0,0 +1,14 @@
+package io.github.fabriccompatibiltylayers.modremappingapi.impl.context;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
+
+public interface ModRemapperContext {
+    void init();
+    void remapMods(Map<Path, Path> pathMap);
+    void afterRemap();
+    void discoverMods(boolean remapClassEdits);
+    void gatherRemappers();
+    Map<String, List<String>> getMixin2TargetMap();
+}
diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/ModRemapperV1Context.java b/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/ModRemapperV1Context.java
@@ -1,28 +1,30 @@
-package io.github.fabriccompatibiltylayers.modremappingapi.impl;
+package io.github.fabriccompatibiltylayers.modremappingapi.impl.context;
 
 import fr.catcore.modremapperapi.utils.Constants;
 import io.github.fabriccompatibiltylayers.modremappingapi.api.v1.ModRemapper;
+import io.github.fabriccompatibiltylayers.modremappingapi.impl.LibraryHandler;
+import io.github.fabriccompatibiltylayers.modremappingapi.impl.MappingsUtilsImpl;
+import io.github.fabriccompatibiltylayers.modremappingapi.impl.ModDiscoverer;
+import io.github.fabriccompatibiltylayers.modremappingapi.impl.compatibility.V0ModRemapper;
 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.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.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import java.util.function.Supplier;
 
-public class ModRemapperContext {
-    private final List<ModRemapper> remappers;
+public class ModRemapperV1Context implements ModRemapperContext {
+    private final List<ModRemapper> remappers = new ArrayList<>();
+    private final Map<String, List<String>> mixin2TargetMap = new HashMap<>();
 
-    public ModRemapperContext(List<ModRemapper> remappers) {
-        this.remappers = remappers;
-    }
+    public ModRemapperV1Context() {}
 
     public void init() {
         for (ModRemapper remapper : remappers) {
@@ -78,4 +80,33 @@ public void remapMods(Map<Path, Path> pathMap) {
 
         MappingsUtilsImpl.writeFullMappings();
     }
+
+    @Override
+    public void afterRemap() {
+        remappers.forEach(ModRemapper::afterRemap);
+    }
+
+    @Override
+    public void discoverMods(boolean remapClassEdits) {
+        ModDiscoverer.init(remappers, remapClassEdits, this);
+    }
+
+    private static final String v0EntrypointName = "mod-remapper-api:modremapper";
+    private static final String v1EntrypointName = "mod-remapper-api:modremapper_v1";
+
+    @Override
+    public void gatherRemappers() {
+        FabricLoader.getInstance()
+                .getEntrypoints(v0EntrypointName, fr.catcore.modremapperapi.api.ModRemapper.class)
+                .stream()
+                .map(V0ModRemapper::new)
+                .forEach(remappers::add);
+
+        remappers.addAll(FabricLoader.getInstance().getEntrypoints(v1EntrypointName, ModRemapper.class));
+    }
+
+    @Override
+    public Map<String, List<String>> getMixin2TargetMap() {
+        return mixin2TargetMap;
+    }
 }
diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/MixinRemappingHelper.java b/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/MixinRemappingHelper.java
diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/resource/RefmapRemapper.java b/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/resource/RefmapRemapper.java
@@ -1,6 +1,7 @@
 package io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.resource;
 
 import com.google.gson.Gson;
+import io.github.fabriccompatibiltylayers.modremappingapi.impl.ModRemappingAPIImpl;
 import io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.MixinRemappingHelper;
 import net.fabricmc.tinyremapper.OutputConsumerPath;
 import net.fabricmc.tinyremapper.TinyRemapper;
@@ -40,7 +41,7 @@ public void transform(Path destinationDirectory, Path relativePath, InputStream
 
     public String mapRefMapEntry(String mixinClass, String old, TinyRemapper remapper) {
         TrRemapper trRemapper = remapper.getEnvironment().getRemapper();
-        List<String> supers = MixinRemappingHelper.MIXIN2TARGETMAP.get(mixinClass);
+        List<String> supers = ModRemappingAPIImpl.getCurrentContext().getMixin2TargetMap().get(mixinClass);
         // format is:
         // owner + name + quantifier + (desc == null || desc.startsWith("(") ? "" : ":") + desc + (tail != null ? " -> " : "") + tail
         String owner; // can be ""
diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/visitor/MixinPostApplyVisitor.java b/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/visitor/MixinPostApplyVisitor.java
@@ -1,6 +1,7 @@
 package io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.visitor;
 
 import fr.catcore.modremapperapi.utils.Constants;
+import io.github.fabriccompatibiltylayers.modremappingapi.impl.ModRemappingAPIImpl;
 import io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.MixinRemappingHelper;
 import net.fabricmc.tinyremapper.TinyRemapper;
 import net.fabricmc.tinyremapper.api.TrClass;
@@ -54,7 +55,7 @@ public ClassVisitor insertApplyVisitor(TrClass cls, ClassVisitor next) {
             });
         }
 
-        MixinRemappingHelper.MIXIN2TARGETMAP.put(cls.getName().replace(".", "/"), supers);
+        ModRemappingAPIImpl.getCurrentContext().getMixin2TargetMap().put(cls.getName().replace(".", "/"), supers);
 
         return next;
     }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.visitor;`
`2`	`2`
`3`	`3`	`import fr.catcore.modremapperapi.utils.Constants;`
	`4`	`+import io.github.fabriccompatibiltylayers.modremappingapi.impl.ModRemappingAPIImpl;`
`4`	`5`	`import io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.MixinRemappingHelper;`
`5`	`6`	`import net.fabricmc.tinyremapper.TinyRemapper;`
`6`	`7`	`import net.fabricmc.tinyremapper.api.TrClass;`
`@@ -54,7 +55,7 @@ public ClassVisitor insertApplyVisitor(TrClass cls, ClassVisitor next) {`
`54`	`55`	`});`
`55`	`56`	`}`
`56`	`57`
`57`		`- MixinRemappingHelper.MIXIN2TARGETMAP.put(cls.getName().replace(".", "/"), supers);`
	`58`	`+ ModRemappingAPIImpl.getCurrentContext().getMixin2TargetMap().put(cls.getName().replace(".", "/"), supers);`
`58`	`59`
`59`	`60`	`return next;`
`60`	`61`	`}`