aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2020-12-08 10:19:25 +0800
committershedaniel <daniel@shedaniel.me>2020-12-08 10:19:25 +0800
commit27c4b42e9fe84fc799820c9bb27f9aa9e0b4b729 (patch)
tree08013cf5fbf09a6fbbbef0d8bfd4c3f6459ff2ff /src/main
parent859b132851e7476d744396ac3b6145018c24f9df (diff)
downloadarchitectury-loom-27c4b42e9fe84fc799820c9bb27f9aa9e0b4b729.tar.gz
architectury-loom-27c4b42e9fe84fc799820c9bb27f9aa9e0b4b729.tar.bz2
architectury-loom-27c4b42e9fe84fc799820c9bb27f9aa9e0b4b729.zip
use my stream shit thank
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/net/fabricmc/loom/util/RunConfig.java20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/main/java/net/fabricmc/loom/util/RunConfig.java b/src/main/java/net/fabricmc/loom/util/RunConfig.java
index 385e553b..f989c217 100644
--- a/src/main/java/net/fabricmc/loom/util/RunConfig.java
+++ b/src/main/java/net/fabricmc/loom/util/RunConfig.java
@@ -34,6 +34,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
@@ -133,19 +136,16 @@ public class RunConfig {
}
if (extension.isForge()) {
- StringBuilder modClasses = new StringBuilder();
SourceSet main = project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().getByName("main");
- for (File classes : main.getOutput().getClassesDirs()) {
- modClasses.append("loom%%");
- modClasses.append(classes.getAbsolutePath());
- modClasses.append(File.pathSeparator);
- }
-
- modClasses.append("loom%%");
- modClasses.append(main.getOutput().getResourcesDir().getAbsolutePath());
+ String modClasses = Stream.concat(
+ Stream.of(main.getOutput().getResourcesDir().getAbsolutePath()),
+ StreamSupport.stream(main.getOutput().getClassesDirs().spliterator(), false)
+ .map(File::getAbsolutePath)
+ ).map(s -> "loom%%" + s)
+ .collect(Collectors.joining(":"));
- runConfig.envVariables.put("MOD_CLASSES", modClasses.toString());
+ runConfig.envVariables.put("MOD_CLASSES", modClasses);
}
if (extension.getLoaderLaunchMethod().equals("launchwrapper")) {