Fix merge conflicts

3 files changed, 5 insertions, 15 deletions

diff --git a/src/main/java/net/fabricmc/loom/LoomGradleExtension.java b/src/main/java/net/fabricmc/loom/LoomGradleExtension.java
index f8b5b3fb..4022d285 100644
--- a/src/main/java/net/fabricmc/loom/LoomGradleExtension.java
+++ b/src/main/java/net/fabricmc/loom/LoomGradleExtension.java
@@ -28,13 +28,11 @@ import java.io.File;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
-import java.util.function.BiPredicate;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
@@ -49,10 +47,9 @@ import org.gradle.api.Project;
 import org.gradle.api.artifacts.Dependency;
 import org.gradle.api.file.ConfigurableFileCollection;
 import org.gradle.api.plugins.BasePluginConvention;
-import org.jetbrains.annotations.ApiStatus;
 import org.gradle.api.plugins.JavaPluginConvention;
 import org.gradle.api.tasks.SourceSet;
-import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.ApiStatus;
 
 import net.fabricmc.loom.api.decompilers.LoomDecompiler;
 import net.fabricmc.loom.configuration.LoomDependencyManager;
@@ -183,8 +180,8 @@ public class LoomGradleExtension {
 		public void mod(String... modIds) {
 			dataGenMods.addAll(Arrays.asList(modIds));
 
-			if (modIds.length > 0 && getRuns().findByName("data") == null) {
-				getRuns().create("data", RunConfigSettings::data);
+			if (modIds.length > 0 && getRunConfigs().findByName("data") == null) {
+				getRunConfigs().create("data", RunConfigSettings::data);
 			}
 		}
 	}
diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/assets/MinecraftAssetsProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/assets/MinecraftAssetsProvider.java
index e185d06d..6118df8a 100644
--- a/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/assets/MinecraftAssetsProvider.java
+++ b/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/assets/MinecraftAssetsProvider.java
@@ -101,7 +101,6 @@ public class MinecraftAssetsProvider {
 				String filename = "objects" + File.separator + sha1.substring(0, 2) + File.separator + sha1;
 				File file = new File(assets, filename);
 
-
 				if (offline) {
 					if (file.exists()) {
 						project.getLogger().warn("Outdated asset " + entry.getKey());
@@ -140,11 +139,6 @@ public class MinecraftAssetsProvider {
 							throw new RuntimeException("Failed to download: " + assetName, e);
 						}
 
-						//Give this logger back
-						if (localFileChecksum == null) {
-							checksumInfos.put(entry.getKey(), sha1);
-						}
-
 						synchronized (progressBar[0]) {
 							progressBar[0].step();
 						}
@@ -154,7 +148,6 @@ public class MinecraftAssetsProvider {
 
 			project.getLogger().info("Took " + stopwatch.stop() + " to iterate " + parent.size() + " asset index.");
 
-
 			//Wait for the assets to all download
 			executor.shutdown();
 
diff --git a/src/main/java/net/fabricmc/loom/task/RunDataTask.java b/src/main/java/net/fabricmc/loom/task/RunDataTask.java
index fbb80951..2c9798dd 100644
--- a/src/main/java/net/fabricmc/loom/task/RunDataTask.java
+++ b/src/main/java/net/fabricmc/loom/task/RunDataTask.java
@@ -32,7 +32,7 @@ public class RunDataTask extends AbstractRunTask {
 	public RunDataTask() {
 		super(project -> {
 			LoomGradleExtension extension = project.getExtensions().getByType(LoomGradleExtension.class);
-			return RunConfig.runConfig(project, extension.getRuns().getByName("data"));
+			return RunConfig.runConfig(project, extension.getRunConfigs().getByName("data"));
 		});
 	}
 }