From 1d1133123b6934967de9ba45094dc178334ca88e Mon Sep 17 00:00:00 2001 From: cpw Date: Sat, 26 Jan 2019 12:29:55 -0500 Subject: [PATCH] Change MOD_CLASSES to support %% separated paths, that are grouped into %% sets. Allows for multiple mods to be located in UserDev. Signed-off-by: cpw --- .../userdev/FMLUserdevLaunchProvider.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/userdev/java/net/minecraftforge/userdev/FMLUserdevLaunchProvider.java b/src/userdev/java/net/minecraftforge/userdev/FMLUserdevLaunchProvider.java index 7e09fa7953..78d3ed9f9f 100644 --- a/src/userdev/java/net/minecraftforge/userdev/FMLUserdevLaunchProvider.java +++ b/src/userdev/java/net/minecraftforge/userdev/FMLUserdevLaunchProvider.java @@ -85,20 +85,27 @@ public abstract class FMLUserdevLaunchProvider extends FMLCommonLaunchHandler { LOGGER.fatal(CORE, "Got mod coordinates {} from env", System.getenv("MOD_CLASSES")); - final List modClasses = Arrays.stream(System.getenv("MOD_CLASSES").split(File.pathSeparator)). - map(Paths::get).collect(Collectors.toList()); + // "a/b/;c/d/;" -> "modid%%c:\fish\pepper;modid%%c:\fish2\pepper2\;modid2%%c:\fishy\bums;modid2%%c:\hmm" + final Map> modClassPaths = Arrays.stream(System.getenv("MOD_CLASSES").split(File.pathSeparator)). + map(inp -> inp.split("%%", 2)).map(this::buildModPair). + collect(Collectors.groupingBy(Pair::getLeft, Collectors.mapping(Pair::getRight, Collectors.toList()))); - LOGGER.fatal(CORE, "Processed mod coordinates [{}]", modClasses.stream().map(Object::toString).collect(Collectors.joining(","))); - - ((Map>>>) arguments).computeIfAbsent("explodedTargets", a->new ArrayList<>()). - add(Pair.of(modClasses.get(0), modClasses.subList(1, modClasses.size()))); + LOGGER.info(CORE, "Found supplied mod coordinates [{}]", modClassPaths); + final List>> explodedTargets = ((Map>>>) arguments).computeIfAbsent("explodedTargets", a -> new ArrayList<>()); + modClassPaths.forEach((modlabel,paths) -> explodedTargets.add(Pair.of(paths.get(0), paths.subList(1, paths.size())))); // generics are gross yea? ((Map)arguments).put("mavenRoots", mavenRoots); ((Map)arguments).put("mods", mods); } + private Pair buildModPair(String[] splitString) { + String modid = splitString.length == 1 ? "defaultmodid" : splitString[0]; + Path path = Paths.get(splitString[splitString.length - 1]); + return Pair.of(modid, path); + } + @Override protected void validatePaths(final Path forgePath, final Path[] mcPaths, final String forgeVersion, final String mcVersion, final String mcpVersion) {