Merge remote-tracking branch 'FabricMC/dev/0.6' into dev/0.6-forge

# Conflicts:
#	build.gradle
#	src/main/java/net/fabricmc/loom/LoomGradleExtension.java
#	src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
#	src/main/java/net/fabricmc/loom/configuration/processors/MinecraftProcessedProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftNativesProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/assets/MinecraftAssetsProvider.java
#	src/main/java/net/fabricmc/loom/task/GenVsCodeProjectTask.java
#	src/main/java/net/fabricmc/loom/util/SourceRemapper.java

9 files changed, 28 insertions, 16 deletions

diff --git a/src/main/java/net/fabricmc/loom/task/DownloadAssetsTask.java b/src/main/java/net/fabricmc/loom/task/DownloadAssetsTask.java
index 8607dbeb..3a5dba87 100644
--- a/src/main/java/net/fabricmc/loom/task/DownloadAssetsTask.java
+++ b/src/main/java/net/fabricmc/loom/task/DownloadAssetsTask.java
@@ -40,6 +40,6 @@ public class DownloadAssetsTask extends AbstractLoomTask {
 		LoomGradleExtension extension = getExtension();
 
 		MinecraftAssetsProvider.provide(extension.getMinecraftProvider(), project);
-		MinecraftNativesProvider.provide(extension.getMinecraftProvider(), project);
+		MinecraftNativesProvider.provide(project);
 	}
 }
diff --git a/src/main/java/net/fabricmc/loom/task/GenEclipseRunsTask.java b/src/main/java/net/fabricmc/loom/task/GenEclipseRunsTask.java
index 1f93ef0b..5a3c868b 100644
--- a/src/main/java/net/fabricmc/loom/task/GenEclipseRunsTask.java
+++ b/src/main/java/net/fabricmc/loom/task/GenEclipseRunsTask.java
@@ -43,7 +43,11 @@ public class GenEclipseRunsTask extends AbstractLoomTask {
 		LoomGradleExtension extension = getExtension();
 		File dataRunConfigs = new File(getProject().getRootDir(), eclipseModel.getProject().getName() + "_data.launch");
 
-		for (RunConfigSettings settings : extension.getRuns()) {
+		for (RunConfigSettings settings : extension.getRunConfigs()) {
+			if (!settings.isIdeConfigGenerated()) {
+				continue;
+			}
+
 			String name = settings.getName();
 
 			File configs = new File(getProject().getRootDir(), eclipseModel.getProject().getName() + "_" + name + ".launch");
diff --git a/src/main/java/net/fabricmc/loom/task/GenIdeaProjectTask.java b/src/main/java/net/fabricmc/loom/task/GenIdeaProjectTask.java
index 8ad3586b..dbf19a65 100644
--- a/src/main/java/net/fabricmc/loom/task/GenIdeaProjectTask.java
+++ b/src/main/java/net/fabricmc/loom/task/GenIdeaProjectTask.java
@@ -83,7 +83,11 @@ public class GenIdeaProjectTask extends AbstractLoomTask {
 			throw new RuntimeException("Failed to generate IntelliJ run configurations (runManager was not found)");
 		}
 
-		for (RunConfigSettings settings : getExtension().getRuns()) {
+		for (RunConfigSettings settings : getExtension().getRunConfigs()) {
+			if (!settings.isIdeConfigGenerated()) {
+				continue;
+			}
+
 			runManager.appendChild(RunConfig.runConfig(project, settings).genRuns(runManager));
 			settings.makeRunDir();
 		}
diff --git a/src/main/java/net/fabricmc/loom/task/GenVsCodeProjectTask.java b/src/main/java/net/fabricmc/loom/task/GenVsCodeProjectTask.java
index e6ea643f..9eb8650a 100644
--- a/src/main/java/net/fabricmc/loom/task/GenVsCodeProjectTask.java
+++ b/src/main/java/net/fabricmc/loom/task/GenVsCodeProjectTask.java
@@ -95,7 +95,11 @@ public class GenVsCodeProjectTask extends AbstractLoomTask {
 			launch = new VsCodeLaunch();
 		}
 
-		for (RunConfigSettings settings : extension.getRuns()) {
+		for (RunConfigSettings settings : extension.getRunConfigs()) {
+			if (!settings.isIdeConfigGenerated()) {
+				continue;
+			}
+
 			launch.add(RunConfig.runConfig(project, settings));
 			settings.makeRunDir();
 		}
diff --git a/src/main/java/net/fabricmc/loom/task/LoomTasks.java b/src/main/java/net/fabricmc/loom/task/LoomTasks.java
index a3aca532..198f92e6 100644
--- a/src/main/java/net/fabricmc/loom/task/LoomTasks.java
+++ b/src/main/java/net/fabricmc/loom/task/LoomTasks.java
@@ -86,9 +86,9 @@ public final class LoomTasks {
 	private static void registerRunTasks(TaskContainer tasks, Project project) {
 		LoomGradleExtension extension = project.getExtensions().getByType(LoomGradleExtension.class);
 
-		Preconditions.checkArgument(extension.getRuns().size() == 0, "Run configurations must not be registered before loom");
+		Preconditions.checkArgument(extension.getRunConfigs().size() == 0, "Run configurations must not be registered before loom");
 
-		extension.getRuns().whenObjectAdded(config -> {
+		extension.getRunConfigs().whenObjectAdded(config -> {
 			String configName = config.getName();
 			String taskName = "run" + configName.substring(0, 1).toUpperCase() + configName.substring(1);
 
@@ -102,8 +102,8 @@ public final class LoomTasks {
 			});
 		});
 
-		extension.getRuns().create("client", RunConfigSettings::client);
-		extension.getRuns().create("server", RunConfigSettings::server);
+		extension.getRunConfigs().create("client", RunConfigSettings::client);
+		extension.getRunConfigs().create("server", RunConfigSettings::server);
 	}
 
 	private static void registerDecompileTasks(TaskContainer tasks, Project project) {
diff --git a/src/main/java/net/fabricmc/loom/task/MigrateMappingsTask.java b/src/main/java/net/fabricmc/loom/task/MigrateMappingsTask.java
index 4de1997b..97217fcb 100644
--- a/src/main/java/net/fabricmc/loom/task/MigrateMappingsTask.java
+++ b/src/main/java/net/fabricmc/loom/task/MigrateMappingsTask.java
@@ -87,7 +87,7 @@ public class MigrateMappingsTask extends AbstractLoomTask {
 		Project project = getProject();
 		LoomGradleExtension extension = getExtension();
 
-		project.getLogger().lifecycle(":loading mappings");
+		project.getLogger().info(":loading mappings");
 
 		if (!Files.exists(inputDir) || !Files.isDirectory(inputDir)) {
 			throw new IllegalArgumentException("Could not find input directory: " + inputDir.toAbsolutePath());
@@ -161,7 +161,7 @@ public class MigrateMappingsTask extends AbstractLoomTask {
 	private static void migrateMappings(Project project, MinecraftMappedProvider minecraftMappedProvider,
 										Path inputDir, Path outputDir, TinyTree currentMappings, TinyTree targetMappings
 	) throws IOException {
-		project.getLogger().lifecycle(":joining mappings");
+		project.getLogger().info(":joining mappings");
 
 		MappingSet mappingSet = new TinyMappingsJoiner(
 				currentMappings, "named",
@@ -191,7 +191,7 @@ public class MigrateMappingsTask extends AbstractLoomTask {
 			project.getLogger().warn("Could not remap fully!", e);
 		}
 
-		project.getLogger().lifecycle(":cleaning file descriptors");
+		project.getLogger().info(":cleaning file descriptors");
 		System.gc();
 	}
 }
diff --git a/src/main/java/net/fabricmc/loom/task/RemapJarTask.java b/src/main/java/net/fabricmc/loom/task/RemapJarTask.java
index 78446707..62ffd1d4 100644
--- a/src/main/java/net/fabricmc/loom/task/RemapJarTask.java
+++ b/src/main/java/net/fabricmc/loom/task/RemapJarTask.java
@@ -133,7 +133,7 @@ public class RemapJarTask extends Jar {
 			remapOption.execute(remapperBuilder);
 		}
 
-		project.getLogger().lifecycle(":remapping " + input.getFileName());
+		project.getLogger().info(":remapping " + input.getFileName());
 
 		StringBuilder rc = new StringBuilder("Remap classpath: ");
 
@@ -165,7 +165,7 @@ public class RemapJarTask extends Jar {
 			throw new RuntimeException("Failed to remap " + input + " to " + output + " - file missing!");
 		}
 
-		if (MixinRefmapHelper.addRefmapName(extension.getRefmapName(), extension.getMixinJsonVersion(), output)) {
+		if (MixinRefmapHelper.addRefmapName(extension.getRefmapName(), output)) {
 			project.getLogger().debug("Transformed mixin reference maps in output JAR!");
 		}
 
@@ -259,7 +259,7 @@ public class RemapJarTask extends Jar {
 						throw new RuntimeException("Failed to remap " + input + " to " + output + " - file missing!");
 					}
 
-					if (MixinRefmapHelper.addRefmapName(extension.getRefmapName(), extension.getMixinJsonVersion(), output)) {
+					if (MixinRefmapHelper.addRefmapName(extension.getRefmapName(), output)) {
 						project.getLogger().debug("Transformed mixin reference maps in output JAR!");
 					}
 
diff --git a/src/main/java/net/fabricmc/loom/task/RunClientTask.java b/src/main/java/net/fabricmc/loom/task/RunClientTask.java
index 0bfaca0c..12504b68 100644
--- a/src/main/java/net/fabricmc/loom/task/RunClientTask.java
+++ b/src/main/java/net/fabricmc/loom/task/RunClientTask.java
@@ -32,7 +32,7 @@ public class RunClientTask extends AbstractRunTask {
 	public RunClientTask() {
 		super(project -> {
 			LoomGradleExtension extension = project.getExtensions().getByType(LoomGradleExtension.class);
-			return RunConfig.runConfig(project, extension.getRuns().getByName("client"));
+			return RunConfig.runConfig(project, extension.getRunConfigs().getByName("client"));
 		});
 	}
 }
diff --git a/src/main/java/net/fabricmc/loom/task/RunServerTask.java b/src/main/java/net/fabricmc/loom/task/RunServerTask.java
index aa9fc94a..7188ce68 100644
--- a/src/main/java/net/fabricmc/loom/task/RunServerTask.java
+++ b/src/main/java/net/fabricmc/loom/task/RunServerTask.java
@@ -32,7 +32,7 @@ public class RunServerTask extends AbstractRunTask {
 	public RunServerTask() {
 		super(project -> {
 			LoomGradleExtension extension = project.getExtensions().getByType(LoomGradleExtension.class);
-			return RunConfig.runConfig(project, extension.getRuns().getByName("client"));
+			return RunConfig.runConfig(project, extension.getRunConfigs().getByName("client"));
 		});
 	}
 }