Bump AF

build.gradle

@@ -73,7 +73,7 @@ dependencies {
  commonImplementation 'com.google.code.gson:gson:2.10.1'
  commonImplementation 'com.google.guava:guava:31.1-jre'
  commonImplementation 'de.siegmar:fastcsv:2.2.1'
- commonImplementation('net.minecraftforge:artifactural:3.0.16') {
+ commonImplementation('net.minecraftforge:artifactural:3.0.18') {
  transitive = false
  }
  commonImplementation('net.minecraftforge:unsafe:0.2.0') {

src/common/java/net/minecraftforge/gradle/common/util/runs/RunConfigGenerator.java

@@ -144,9 +144,17 @@ protected static Map<String, Supplier<String>> configureTokensLazy(final Project
  Map<String, Supplier<String>> tokens = new HashMap<>();
  runConfig.getTokens().forEach((k, v) -> tokens.put(k, () -> v));
  runConfig.getLazyTokens().forEach((k, v) -> tokens.put(k, Suppliers.memoize(v::get)));
- tokens.compute("source_roots", (key, sourceRoots) -> Suppliers.memoize(() -> ((sourceRoots != null)
- ? Stream.concat(Arrays.stream(sourceRoots.get().split(File.pathSeparator)), modClasses)
- : modClasses).distinct().collect(Collectors.joining(File.pathSeparator))));
+ tokens.compute("source_roots", (k, v) -> {
+ Stream<String> paths;
+ if (v == null)
+ paths = modClasses;
+ else {
+ String[] existing = v.get().split(File.pathSeparator);
+ paths = Stream.concat(Arrays.stream(existing), modClasses);
+ }
+
+ return Suppliers.memoize(() -> paths.distinct().collect(Collectors.joining(File.pathSeparator)));
+ });
 
  Supplier<String> runtimeClasspath = tokens.compute("runtime_classpath", makeClasspathToken(runtimeClasspathArtifacts));
  Supplier<String> minecraftClasspath = tokens.compute("minecraft_classpath", makeClasspathToken(minecraftArtifacts));