Add default global dependency override for cloth-config2

This is a common aliased mod dependency that needs an override to work with its forge version, which uses a different modid. To provide more comfort to our users, we add a default override for this dependency.

Author: Su5eD

src/main/java/dev/su5ed/sinytra/connector/ConnectorUtil.java

@@ -5,16 +5,22 @@
 import com.google.gson.GsonBuilder;
 import cpw.mods.modlauncher.api.ServiceRunner;
 import dev.su5ed.sinytra.connector.locator.EmbeddedDependencies;
+import net.fabricmc.loader.api.metadata.ModDependency;
+import net.fabricmc.loader.impl.metadata.ModDependencyImpl;
 import net.minecraftforge.fml.loading.FMLPaths;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;
 
+import static cpw.mods.modlauncher.api.LamdbaExceptionUtils.uncheck;
+
 public final class ConnectorUtil {
     public static final String MIXIN_CONFIGS_ATTRIBUTE = "MixinConfigs";
     public static final String FABRIC_MOD_JSON = "fabric.mod.json";
@@ -99,6 +105,11 @@ public final class ConnectorUtil {
         "null",
         "_"
     );
+    // Common aliased mod dependencies that don't work with forge ports, which use a different modid.
+    // They're too annoying to override individually in each mod, so we provide this small QoL feature for the user's comfort
+    private static final Map<String, String> GLOBAL_DEPENDENCY_OVERRIDES = Map.of(
+        "cloth-config2", "cloth_config"
+    );
 
     private static final boolean CACHE_ENABLED;
 
@@ -162,8 +173,22 @@ public static <V> V uncheckThrowable(UncheckedSupplier<V> supplier) {
         }
     }
 
-    public static String stripColor(String p_14407_) {
-        return STRIP_COLOR_PATTERN.matcher(p_14407_).replaceAll("");
+    public static String stripColor(String str) {
+        return str != null ? STRIP_COLOR_PATTERN.matcher(str).replaceAll("") : null;
+    }
+
+    public static List<ModDependency> applyGlobalDependencyOverrides(Collection<ModDependency> dependencies) {
+        return dependencies.stream()
+            .map(dependency -> {
+                for (Map.Entry<String, String> entry : GLOBAL_DEPENDENCY_OVERRIDES.entrySet()) {
+                    String key = entry.getKey();
+                    if (dependency.getKind() == ModDependency.Kind.DEPENDS && dependency.getModId().equals(key)) {
+                        return uncheck(() -> new ModDependencyImpl(ModDependency.Kind.DEPENDS, entry.getValue(), List.of("*")));
+                    }
+                }
+                return dependency;
+            })
+            .toList();
     }
 
     @FunctionalInterface

src/main/java/dev/su5ed/sinytra/connector/loader/ConnectorLoaderModMetadata.java

@@ -28,13 +28,16 @@ public class ConnectorLoaderModMetadata implements LoaderModMetadata {
 
     private final LoaderModMetadata wrapped;
     private final String normalModid;
+    private List<ModDependency> dependencies;
 
     public ConnectorLoaderModMetadata(LoaderModMetadata wrapped) {
         this.wrapped = wrapped;
         // Adjust modid to accomodate Java Module System requirements
         String replaced = this.wrapped.getId().replace('-', '_');
         // If modid is amongst reserved keywords, add a suffix
         this.normalModid = ConnectorUtil.isJavaReservedKeyword(replaced) ? replaced + NORMALIZER_SUFFIX : replaced;
+        // Apply global dependency overrides to mods
+        this.dependencies = ConnectorUtil.applyGlobalDependencyOverrides(this.wrapped.getDependencies());
     }
 
     /**
@@ -113,6 +116,7 @@ public void setVersion(Version version) {
     @Override
     public void setDependencies(Collection<ModDependency> dependencies) {
         this.wrapped.setDependencies(dependencies);
+        this.dependencies = ConnectorUtil.applyGlobalDependencyOverrides(this.wrapped.getDependencies());
     }
 
     @Override
@@ -147,7 +151,7 @@ public ModEnvironment getEnvironment() {
 
     @Override
     public Collection<ModDependency> getDependencies() {
-        return this.wrapped.getDependencies();
+        return this.dependencies;
     }
 
     @Override