feat: Add optional Identifier to modProxy, log selected proxy

Author: BlayTheNinth

common/src/main/java/net/blay09/mods/balm/api/Balm.java

@@ -99,6 +99,10 @@ public static <T> ModProxy<T> modProxy() {
         return runtime.modProxy();
     }
 
+    public static <T> ModProxy<T> modProxy(ResourceLocation identifier) {
+        return runtime.modProxy(identifier);
+    }
+
     public static <T> SidedProxy<T> sidedProxy(String commonName, String clientName) {
         return runtime.sidedProxy(commonName, clientName);
     }

common/src/main/java/net/blay09/mods/balm/api/BalmRuntime.java

@@ -97,6 +97,8 @@ public interface BalmRuntime {
 
     <T> ModProxy<T> modProxy();
 
+    <T> ModProxy<T> modProxy(ResourceLocation identifier);
+
     String getPlatform();
 
     default void initializeModule(BalmModule module) {

common/src/main/java/net/blay09/mods/balm/common/CommonBalmRuntime.java

@@ -10,6 +10,7 @@
 import net.blay09.mods.balm.common.config.ConfigSync;
 import net.blay09.mods.balm.common.proxy.ModProxyImpl;
 import net.blay09.mods.balm.common.proxy.PlatformProxyImpl;
+import net.minecraft.resources.ResourceLocation;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
@@ -65,6 +66,11 @@ public <T> ModProxy<T> modProxy() {
         return new ModProxyImpl<>(this::getModVersion);
     }
 
+    @Override
+    public <T> ModProxy<T> modProxy(ResourceLocation identifier) {
+        return new ModProxyImpl<>(this::getModVersion, identifier);
+    }
+
     protected abstract Optional<String> getModVersion(String modId);
 
     public void initializeRuntime() {

common/src/main/java/net/blay09/mods/balm/common/proxy/ModProxyImpl.java

@@ -1,26 +1,36 @@
 package net.blay09.mods.balm.common.proxy;
 
 import net.blay09.mods.balm.api.proxy.ModProxy;
+import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Function;
 import java.util.function.Supplier;
-import java.util.stream.Collectors;
 
 public class ModProxyImpl<T> implements ModProxy<T> {
 
+    private final Logger logger = LoggerFactory.getLogger(ModProxyImpl.class);
+
     private final Function<String, Optional<String>> modVersionProvider;
     private final List<ModEntry<T>> proxies = new ArrayList<>();
+    private final @Nullable ResourceLocation identifier;
     @Nullable
     private Function<List<T>, T> multiplexer;
     private @Nullable T fallback;
 
     public ModProxyImpl(Function<String, Optional<String>> modVersionProvider) {
+        this(modVersionProvider, null);
+    }
+
+    public ModProxyImpl(Function<String, Optional<String>> modVersionProvider, @Nullable ResourceLocation identifier) {
         this.modVersionProvider = modVersionProvider;
+        this.identifier = identifier;
     }
 
     @Override
@@ -60,14 +70,40 @@ public ModProxy<T> withFallback(T fallback) {
     public T build() {
         final var applicableProxies = proxies.stream().filter(this::isApplicable).toList();
         if (multiplexer != null && applicableProxies.size() > 1) {
-            return multiplexer.apply(applicableProxies.stream().map(ModEntry::proxy).map(Supplier::get).collect(Collectors.toList()));
+            final var effectiveProxies = new ArrayList<T>();
+            for (final var applicableProxy : applicableProxies) {
+                try {
+                    effectiveProxies.add(applicableProxy.proxy.get());
+                } catch (Exception e) {
+                    logger.error("Failed to instantiate proxy", e);
+                }
+            }
+            if (effectiveProxies.size() > 1) {
+                final var proxy = multiplexer.apply(effectiveProxies);
+                logger.info("Mod proxy {} resolved as {}", identifier != null ? identifier : "<unnamed>", proxy);
+                return proxy;
+            }
+            final var proxy = effectiveProxies.get(0);
+            logger.info("Mod proxy {} resolved as {}", identifier != null ? identifier : "<unnamed>", proxy);
+            return proxy;
         }
 
-        if (applicableProxies.isEmpty()) {
-            return fallback;
+        for (final var applicableProxy : applicableProxies) {
+            try {
+                final var proxy = applicableProxy.proxy.get();
+                logger.info("Mod proxy {} resolved as {}", identifier != null ? identifier : "<unnamed>", proxy);
+                return proxy;
+            } catch (Exception e) {
+                logger.error("Failed to instantiate proxy {}", identifier != null ? identifier : "<unnamed>", e);
+            }
         }
 
-        return applicableProxies.get(0).proxy().get();
+        if (fallback != null) {
+            logger.info("Mod proxy {} resolved as {}", identifier != null ? identifier : "<unnamed>", fallback);
+        } else {
+            logger.warn("No applicable proxy found for {}", identifier != null ? identifier : "<unnamed>");
+        }
+        return fallback;
     }
 
     private boolean isApplicable(ModEntry<T> proxy) {

fabric/src/main/java/net/blay09/mods/balm/fabric/FabricBalmRuntime.java

@@ -88,7 +88,7 @@ public class FabricBalmRuntime extends CommonBalmRuntime {
     private final BalmRecipes recipes = new FabricBalmRecipes();
     private final BalmModSupport modSupport = new FabricBalmModSupport(this);
     private final BalmParticles particles = new FabricBalmParticles();
-    private final Supplier<BalmPermissions> permissions = this.<BalmPermissions>modProxy()
+    private final Supplier<BalmPermissions> permissions = this.<BalmPermissions>modProxy(new ResourceLocation("balm", "permissions"))
             .with("fabric-permissions-api-v0", "[0.3,0.4)", "net.blay09.mods.balm.fabric.compat.FabricPermissionsAPIIntegration")
             .withFallback(new CommonBalmPermissions())
             .buildLazily();