From b8270cd9ff71678bd71f93938b35e5904b5f507a Mon Sep 17 00:00:00 2001 From: LexManos Date: Thu, 9 May 2024 09:39:25 -0700 Subject: [PATCH] Filter paths discovered by ServiceProvider in ClasspathLocator. Closes #9899 --- .../fml/loading/ModDirTransformerDiscoverer.java | 14 ++++++++++++++ .../loading/moddiscovery/AbstractModProvider.java | 1 - .../fml/loading/moddiscovery/ClasspathLocator.java | 8 ++++++-- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/ModDirTransformerDiscoverer.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/ModDirTransformerDiscoverer.java index 072ab5d44c..d0a20f6c05 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/ModDirTransformerDiscoverer.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/ModDirTransformerDiscoverer.java @@ -10,6 +10,8 @@ import cpw.mods.jarhandling.SecureJar; import cpw.mods.modlauncher.api.LamdbaExceptionUtils; import cpw.mods.modlauncher.api.NamedPath; import cpw.mods.modlauncher.serviceapi.ITransformerDiscoveryService; + +import org.jetbrains.annotations.ApiStatus; import org.slf4j.Logger; import java.io.IOException; @@ -20,6 +22,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; +@ApiStatus.Internal public class ModDirTransformerDiscoverer implements ITransformerDiscoveryService { private static final Logger LOGGER = LogUtils.getLogger(); private static final Set SERVICES = Set.of( @@ -76,4 +79,15 @@ public class ModDirTransformerDiscoverer implements ITransformerDiscoveryService .filter(SERVICES::contains) .forEach(s -> found.add(new NamedPath(s, path))); } + + public static boolean isServiceProvider(Path path) { + var jar = SecureJar.from(path); + + for (var providers : jar.moduleDataProvider().descriptor().provides()) { + if (SERVICES.contains(providers.service())) + return true; + } + + return false; + } } diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractModProvider.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractModProvider.java index 151ef30744..be4e6704df 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractModProvider.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractModProvider.java @@ -8,7 +8,6 @@ package net.minecraftforge.fml.loading.moddiscovery; import com.mojang.logging.LogUtils; import cpw.mods.jarhandling.JarMetadata; import cpw.mods.jarhandling.SecureJar; -import net.minecraftforge.fml.loading.EarlyLoadingException; import net.minecraftforge.fml.loading.LogMarkers; import net.minecraftforge.forgespi.language.IConfigurable; import net.minecraftforge.forgespi.language.IModFileInfo; diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ClasspathLocator.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ClasspathLocator.java index 1d73f4c72e..c75218cf42 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ClasspathLocator.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ClasspathLocator.java @@ -8,6 +8,7 @@ package net.minecraftforge.fml.loading.moddiscovery; import com.mojang.logging.LogUtils; import net.minecraftforge.fml.loading.LogMarkers; +import net.minecraftforge.fml.loading.ModDirTransformerDiscoverer; import net.minecraftforge.forgespi.locating.IModLocator; import org.jetbrains.annotations.ApiStatus; @@ -71,8 +72,11 @@ public class ClasspathLocator extends AbstractModProvider implements IModLocator } var ret = new ArrayList(); - for (var path : claimed) - ret.add(createMod(path)); + for (var path : claimed) { + // Filter out anything found by the ServiceLoader + if (!ModDirTransformerDiscoverer.isServiceProvider(path)) + ret.add(createMod(path)); + } return ret; }