Refactor LoomGradleExtension (#431)

* First pass at refactoring the extension

* Fix inital issues.

* Combine some interfaces

* Checkstyle

* Fix years

* Add isShareCaches to api

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 c7088a0a..808c857c 100644
--- a/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java
+++ b/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java
@@ -127,7 +127,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 = "intermediary";
 		String toM = "named";
 
@@ -210,28 +210,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)) {