keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Allow classpath locator to discover jars via FMLModType attribute

Browse source
This commit is contained in:
tterrag 2019-12-05 21:50:33 -05:00
parent cfc53c939e
commit 5c88451f6f
2 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/fmllauncher/java/net/minecraftforge/fml/loading/moddiscovery/ModFile.java
View file

@ -92,7 +92,7 @@ public class ModFile implements IModFile {
private List<CoreModFile> coreMods; private List<CoreModFile> coreMods;
private Path accessTransformer; private Path accessTransformer;
private static final Attributes.Name TYPE = new Attributes.Name("FMLModType"); public static final Attributes.Name TYPE = new Attributes.Name("FMLModType");
public ModFile(final Path file, final IModLocator locator) { public ModFile(final Path file, final IModLocator locator) {
this.locator = locator; this.locator = locator;

40
src/userdev/java/net/minecraftforge/userdev/ClasspathLocator.java
View file

@ -25,24 +25,29 @@ import java.io.IOException;
import java.net.URL; import java.net.URL;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.function.Predicate;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import net.minecraftforge.forgespi.locating.IModFile;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import com.google.common.base.Predicates;
import net.minecraftforge.fml.loading.LibraryFinder; import net.minecraftforge.fml.loading.LibraryFinder;
import net.minecraftforge.fml.loading.moddiscovery.AbstractJarFileLocator; import net.minecraftforge.fml.loading.moddiscovery.AbstractJarFileLocator;
import net.minecraftforge.fml.loading.moddiscovery.ModFile; import net.minecraftforge.fml.loading.moddiscovery.ModFile;
import net.minecraftforge.forgespi.locating.IModFile;
public class ClasspathLocator extends AbstractJarFileLocator { public class ClasspathLocator extends AbstractJarFileLocator {
private static final Logger LOGGER = LogManager.getLogger(); private static final Logger LOGGER = LogManager.getLogger();
private static final String MODS_TOML = "META-INF/mods.toml"; private static final String MODS_TOML = "META-INF/mods.toml";
private List<Path> modCoords; private static final String MANIFEST = "META-INF/MANIFEST.MF";
private Set<Path> modCoords;
@Override @Override
public List<IModFile> scanMods() { public List<IModFile> scanMods() {
@ -60,20 +65,27 @@ public class ClasspathLocator extends AbstractJarFileLocator {
@Override @Override
public void initArguments(Map<String, ?> arguments) { public void initArguments(Map<String, ?> arguments) {
try { try {
modCoords = new ArrayList<>(); modCoords = new LinkedHashSet<>();
final Enumeration<URL> resources = ClassLoader.getSystemClassLoader().getResources(MODS_TOML); locateMods(MODS_TOML, "classpath_mod", Predicates.alwaysTrue());
while (resources.hasMoreElements()) { locateMods(MANIFEST, "manifest_jar", path -> findManifest(path).map(m -> m.getMainAttributes().getValue(ModFile.TYPE)).isPresent());
URL url = resources.nextElement();
Path path = LibraryFinder.findJarPathFor(MODS_TOML, "classpath_mod", url);
if (Files.isDirectory(path))
continue;
LOGGER.debug(CORE, "Found classpath mod: {}", path);
this.modCoords.add(path);
}
} catch (IOException e) { } catch (IOException e) {
LOGGER.fatal(CORE,"Error trying to find resources", e); LOGGER.fatal(CORE,"Error trying to find resources", e);
throw new RuntimeException("wha?", e); throw new RuntimeException("wha?", e);
} }
} }
private void locateMods(String resource, String name, Predicate<Path> filter) throws IOException {
final Enumeration<URL> modsTomls = ClassLoader.getSystemClassLoader().getResources(resource);
while (modsTomls.hasMoreElements()) {
URL url = modsTomls.nextElement();
Path path = LibraryFinder.findJarPathFor(resource, name, url);
if (Files.isDirectory(path))
continue;
if (filter.test(path)) {
LOGGER.debug(CORE, "Found classpath mod: {}", path);
this.modCoords.add(path);
}
}
}
} }