From dd8239c255b399720ce38e2b7d3195906521d873 Mon Sep 17 00:00:00 2001 From: Su5eD Date: Wed, 30 Nov 2022 23:50:30 +0100 Subject: [PATCH] Allow discovering services from the mods folder that use java's modular definition. (#9143) --- .../loading/ModDirTransformerDiscoverer.java | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 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 62b167146d..eb810bae15 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/ModDirTransformerDiscoverer.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/ModDirTransformerDiscoverer.java @@ -6,21 +6,27 @@ package net.minecraftforge.fml.loading; import com.mojang.logging.LogUtils; +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.slf4j.Logger; -import java.io.File; import java.io.IOException; +import java.lang.module.ModuleDescriptor; import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; import java.util.List; -import java.util.zip.ZipFile; +import java.util.Set; public class ModDirTransformerDiscoverer implements ITransformerDiscoveryService { private static final Logger LOGGER = LogUtils.getLogger(); + private static final Set SERVICES = Set.of( + "cpw.mods.modlauncher.api.ITransformationService", + "net.minecraftforge.forgespi.locating.IModLocator", + "net.minecraftforge.forgespi.locating.IDependencyLocator" + ); @Override public List candidates(final Path gameDirectory) { @@ -51,14 +57,11 @@ public class ModDirTransformerDiscoverer implements ITransformerDiscoveryService if (!Files.isRegularFile(path)) return; if (!path.toString().endsWith(".jar")) return; if (LamdbaExceptionUtils.uncheck(() -> Files.size(path)) == 0) return; - try (ZipFile zf = new ZipFile(new File(path.toUri()))) { - if (zf.getEntry("META-INF/services/cpw.mods.modlauncher.api.ITransformationService") != null) { - found.add(new NamedPath(zf.getName(), path)); - } else if (zf.getEntry("META-INF/services/net.minecraftforge.forgespi.locating.IModLocator") != null) { - found.add(new NamedPath(zf.getName(), path)); - } - } catch (IOException ioe) { - LOGGER.error("Zip Error when loading jar file {}", path, ioe); - } + + SecureJar jar = SecureJar.from(path); + jar.moduleDataProvider().descriptor().provides().stream() + .map(ModuleDescriptor.Provides::service) + .filter(SERVICES::contains) + .forEach(s -> found.add(new NamedPath(s, path))); } }