feat: Add optional Identifier to modProxy, log selected proxy

Author: BlayTheNinth

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

@@ -21,6 +21,7 @@
 import net.blay09.mods.balm.platform.runtime.internal.BalmRuntime;
 import net.blay09.mods.balm.platform.runtime.BalmRuntimeLoadContext;
 import net.blay09.mods.balm.platform.runtime.internal.BalmRuntimeSpi;
+import net.minecraft.resources.Identifier;
 
 import java.util.function.Consumer;
 
@@ -107,6 +108,17 @@ public static <T> ModProxy<T> modProxy() {
         return runtime.modProxy();
     }
 
+    /**
+     * Creates a mod proxy, which you can use to provide differing implementations depending on which mods are loaded under a common interface.
+     *
+     * @param identifier the identifier for this mod proxy.
+     * @param <T>        the type of the common interface.
+     * @return a builder for a mod proxy.
+     */
+    public static <T> ModProxy<T> modProxy(Identifier identifier) {
+        return runtime.modProxy(identifier);
+    }
+
     /**
      * Creates a sided proxy, which you can use to provide differing implementations for whether the mod is running on the client or a dedicated server under a common interface.
      * When providing class names, do not use {@link Class#getName()} as that will cause the class to be loaded and cause crashes on dedicated servers!

common/src/main/java/net/blay09/mods/balm/platform/internal/ModProxyImpl.java

@@ -2,6 +2,7 @@
 
 import net.blay09.mods.balm.platform.ModProxy;
 import net.blay09.mods.balm.platform.ModInfo;
+import net.minecraft.resources.Identifier;
 import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,12 +20,18 @@ public class ModProxyImpl<T> implements ModProxy<T> {
 
     private final Function<String, Optional<ModInfo>> modInfoProvider;
     private final List<ModEntry<T>> proxies = new ArrayList<>();
+    private final @Nullable Identifier identifier;
     @Nullable
     private Function<List<T>, T> multiplexer;
     private @Nullable T fallback;
 
     public ModProxyImpl(Function<String, Optional<ModInfo>> modInfoProvider) {
+        this(modInfoProvider, null);
+    }
+
+    public ModProxyImpl(Function<String, Optional<ModInfo>> modInfoProvider, @Nullable Identifier identifier) {
         this.modInfoProvider = modInfoProvider;
+        this.identifier = identifier;
     }
 
     @Override
@@ -72,20 +79,31 @@ public T build() {
                     logger.error("Failed to instantiate proxy", e);
                 }
             }
-            if(effectiveProxies.size() > 1) {
-                return multiplexer.apply(effectiveProxies);
+            if (effectiveProxies.size() > 1) {
+                final var proxy = multiplexer.apply(effectiveProxies);
+                logger.info("Mod proxy {} resolved as {}", identifier != null ? identifier : "<unnamed>", proxy);
+                return proxy;
             }
-            return effectiveProxies.getFirst();
+            final var proxy = effectiveProxies.getFirst();
+            logger.info("Mod proxy {} resolved as {}", identifier != null ? identifier : "<unnamed>", proxy);
+            return proxy;
         }
 
         for (final var applicableProxy : applicableProxies) {
             try {
-                return applicableProxy.proxy.get();
+                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", e);
+                logger.error("Failed to instantiate proxy {}", identifier != null ? identifier : "<unnamed>", e);
             }
         }
 
+        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;
     }
 

common/src/main/java/net/blay09/mods/balm/platform/runtime/internal/BalmRuntime.java

@@ -37,6 +37,7 @@
 import net.blay09.mods.balm.world.level.block.entity.BalmBlockEntityTypeRegistrar;
 import net.minecraft.core.Registry;
 import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.Identifier;
 import net.minecraft.resources.ResourceKey;
 
 import java.util.function.Consumer;
@@ -78,6 +79,8 @@ public interface BalmRuntime<TLoadContext extends BalmRuntimeLoadContext> {
 
     <T> ModProxy<T> modProxy();
 
+    <T> ModProxy<T> modProxy(Identifier identifier);
+
     default void initializeModule(BalmModule module) {
         final var modId = module.getId().getNamespace();
         module.registerConfig(getConfig());

common/src/main/java/net/blay09/mods/balm/platform/runtime/internal/CommonBalmRuntime.java

@@ -24,6 +24,7 @@
 import net.blay09.mods.balm.core.component.internal.BalmDataComponentTypeRegistrarImpl;
 import net.blay09.mods.balm.world.level.block.BalmBlockRegistrar;
 import net.blay09.mods.balm.world.level.block.internal.BalmBlockRegistrarImpl;
+import net.minecraft.resources.Identifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -84,6 +85,11 @@ public <T> ModProxy<T> modProxy() {
         return new ModProxyImpl<>((modId) -> platform().getModInfo(modId));
     }
 
+    @Override
+    public <T> ModProxy<T> modProxy(Identifier identifier) {
+        return new ModProxyImpl<>((modId) -> platform().getModInfo(modId), identifier);
+    }
+
     public void initializeRuntime() {
         ready = true;
         for (final var callback : initCallbacks) {

fabric/src/main/java/net/blay09/mods/balm/fabric/platform/runtime/internal/FabricBalmRuntime.java

@@ -53,6 +53,7 @@
 import net.blay09.mods.balm.platform.attachment.BalmDataAttachmentTypeRegistrar;
 import net.blay09.mods.balm.fabric.platform.attachment.internal.FabricBalmDataAttachmentTypeRegistrar;
 import net.blay09.mods.balm.world.entity.ai.village.poi.BalmPoiTypeRegistrar;
+import net.minecraft.resources.Identifier;
 
 import java.util.function.Consumer;
 import java.util.function.Supplier;
@@ -68,7 +69,7 @@ public class FabricBalmRuntime extends CommonBalmRuntime<FabricLoadContext> {
     private final BalmLootTables lootTables = new CommonBalmLootTables();
     private final BalmModSupport modSupport = new FabricBalmModSupport(this);
     private final BalmPlatform platform = new FabricBalmPlatform();
-    private final Supplier<BalmPermissions> permissions = this.<BalmPermissions>modProxy()
+    private final Supplier<BalmPermissions> permissions = this.<BalmPermissions>modProxy(Identifier.fromNamespaceAndPath("balm", "permissions"))
             .with("fabric-permissions-api-v0", "[0.7,)", "net.blay09.mods.balm.fabric.platform.compatibility.permissions.internal.FabricPermissionsAPIIntegration")
             .withFallback(new CommonBalmPermissions())
             .buildLazily();