Merge remote-tracking branch 'FabricMC/dev/0.9' into dev/0.9

# Conflicts:
#	src/main/java/net/fabricmc/loom/LoomGradleExtension.java
#	src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
#	src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java
#	src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java
#	src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProviderImpl.java
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java
#	src/main/java/net/fabricmc/loom/task/GenerateSourcesTask.java

1 files changed, 4 insertions, 17 deletions

diff --git a/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java b/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java
index b13cf0ea..b7b37506 100644
--- a/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java
+++ b/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java
@@ -137,7 +137,7 @@ public class ModProcessor {
 	}
 
 	private static void remapJars(Project project, List<ModDependencyInfo> processList) throws IOException {
-		LoomGradleExtension extension = project.getExtensions().getByType(LoomGradleExtension.class);
+		LoomGradleExtension extension = LoomGradleExtension.get(project);
 		String fromM = extension.isForge() ? "srg" : "intermediary";
 		String toM = "named";
 
@@ -277,28 +277,15 @@ public class ModProcessor {
 
 	public static JsonObject readInstallerJson(File file, Project project) {
 		try {
-			LoomGradleExtension extension = project.getExtensions().getByType(LoomGradleExtension.class);
-			String launchMethod = extension.getLoaderLaunchMethod();
+			LoomGradleExtension extension = LoomGradleExtension.get(project);
 
 			String jsonStr;
 
 			try (JarFile jarFile = new JarFile(file)) {
-				ZipEntry entry = null;
-
-				if (!launchMethod.isEmpty()) {
-					entry = jarFile.getEntry("fabric-installer." + launchMethod + ".json");
-
-					if (entry == null) {
-						project.getLogger().warn("Could not find loader launch method '" + launchMethod + "', falling back");
-					}
-				}
+				ZipEntry entry = jarFile.getEntry("fabric-installer.json");
 
 				if (entry == null) {
-					entry = jarFile.getEntry("fabric-installer.json");
-
-					if (entry == null) {
-						return null;
-					}
+					return null;
 				}
 
 				try (InputStream inputstream = jarFile.getInputStream(entry)) {