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, 3 insertions, 45 deletions

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 f6252882..305dcfe7 100644
--- a/src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java
+++ b/src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java
@@ -27,12 +27,10 @@ package net.fabricmc.loom.configuration.ide;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
 import com.google.common.base.Strings;
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -44,7 +42,6 @@ import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
 import net.fabricmc.loom.LoomGradleExtension;
-import net.fabricmc.loom.util.Constants;
 import net.fabricmc.loom.util.OperatingSystem;
 
 public class RunConfig {
@@ -110,42 +107,8 @@ public class RunConfig {
 		runConfig.vmArgs = "";
 		runConfig.programArgs = "";
 
-		if ("launchwrapper".equals(extension.getLoaderLaunchMethod())) {
-			runConfig.mainClass = "net.minecraft.launchwrapper.Launch"; // TODO What about custom tweakers for run configs?
-			runConfig.programArgs += "--tweakClass " + ("client".equals(environment) ? Constants.LaunchWrapper.DEFAULT_FABRIC_CLIENT_TWEAKER : Constants.LaunchWrapper.DEFAULT_FABRIC_SERVER_TWEAKER);
-		} else {
-			runConfig.mainClass = "net.fabricmc.devlaunchinjector.Main";
-			runConfig.vmArgs = "-XX:+ShowCodeDetailsInExceptionMessages -Dfabric.dli.config=" + encodeEscaped(extension.getDevLauncherConfig().getAbsolutePath()) + " -Dfabric.dli.env=" + environment.toLowerCase();
-		}
-
-		if (extension.getLoaderLaunchMethod().equals("launchwrapper")) {
-			// if installer.json found...
-			JsonObject installerJson = extension.getInstallerData().installerJson();
-
-			if (installerJson != null) {
-				List<String> sideKeys = ImmutableList.of(environment, "common");
-
-				// copy launchwrapper tweakers
-				if (installerJson.has("launchwrapper")) {
-					JsonObject launchwrapperJson = installerJson.getAsJsonObject("launchwrapper");
-
-					if (launchwrapperJson.has("tweakers")) {
-						JsonObject tweakersJson = launchwrapperJson.getAsJsonObject("tweakers");
-						StringBuilder builder = new StringBuilder();
-
-						for (String s : sideKeys) {
-							if (tweakersJson.has(s)) {
-								for (JsonElement element : tweakersJson.getAsJsonArray(s)) {
-									builder.append(" --tweakClass ").append(element.getAsString());
-								}
-							}
-						}
-
-						runConfig.programArgs += builder.toString();
-					}
-				}
-			}
-		}
+		runConfig.mainClass = "net.fabricmc.devlaunchinjector.Main";
+		runConfig.vmArgs = "-XX:+ShowCodeDetailsInExceptionMessages -Dfabric.dli.config=" + encodeEscaped(extension.getFiles().getDevLauncherConfig().getAbsolutePath()) + " -Dfabric.dli.env=" + environment.toLowerCase();
 	}
 
 	// Turns camelCase/PascalCase into Capital Case
@@ -159,7 +122,7 @@ public class RunConfig {
 	}
 
 	public static RunConfig runConfig(Project project, RunConfigSettings settings) {
-		LoomGradleExtension extension = project.getExtensions().getByType(LoomGradleExtension.class);
+		LoomGradleExtension extension = LoomGradleExtension.get(project);
 		String name = settings.getName();
 
 		String configName = settings.getConfigName();
@@ -264,11 +227,6 @@ public class RunConfig {
 			return mainClassName;
 		}
 
-		// Fallback to default class names, happens when in a loader dev env
-		if ("launchwrapper".equals(extension.getLoaderLaunchMethod())) {
-			return "net.minecraft.launchwrapper.Launch";
-		}
-
 		return defaultMainClass;
 	}