From 695863367fb42d6435a36aea9290cb9eb1638ced Mon Sep 17 00:00:00 2001 From: shedaniel Date: Tue, 20 Jul 2021 23:44:11 +0800 Subject: Fix merge conflicts Signed-off-by: shedaniel --- src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java') diff --git a/src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java b/src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java index f3a83ef0..33aee980 100644 --- a/src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java +++ b/src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java @@ -28,6 +28,8 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.List; import java.util.Map; import java.util.HashMap; import java.util.Objects; @@ -133,7 +135,7 @@ public class RunConfig { if (extension.isForge()) { List modClasses = new ArrayList<>(); - for (Supplier sourceSetSupplier : extension.forgeLocalMods) { + for (Supplier sourceSetSupplier : extension.getForgeLocalMods()) { SourceSet sourceSet = sourceSetSupplier.get(); String sourceSetName = sourceSet.getName() + "_" + UUID.randomUUID().toString().replace("-", "").substring(0, 7); @@ -214,7 +216,7 @@ public class RunConfig { runConfig.programArgs = runConfig.programArgs.trim(); runConfig.vmArgs = runConfig.vmArgs.trim(); - for (Consumer consumer : extension.settingsPostEdit) { + for (Consumer consumer : extension.getSettingsPostEdit()) { consumer.accept(runConfig); } -- cgit