Fix merge conflicts

Signed-off-by: shedaniel <daniel@shedaniel.me>

13 files changed, 32 insertions, 30 deletions

diff --git a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
index 07a01118..42d6e0fd 100644
--- a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
+++ b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
@@ -61,11 +61,11 @@ public final class CompileConfiguration {
 		LoomGradleExtension extension = LoomGradleExtension.get(project);
 
 		project.afterEvaluate(project1 -> {
-			if (project.getExtensions().getByType(LoomGradleExtension.class).shouldGenerateSrgTiny()) {
+			if (extension.shouldGenerateSrgTiny()) {
 				extension.createLazyConfiguration(Constants.Configurations.SRG).configure(configuration -> configuration.setTransitive(false));
 			}
 
-			if (project.getExtensions().getByType(LoomGradleExtension.class).isDataGenEnabled()) {
+			if (extension.isDataGenEnabled()) {
 				project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().getByName("main").resources(files -> {
 					files.srcDir(project.file("src/generated/resources"));
 				});
@@ -79,7 +79,7 @@ public final class CompileConfiguration {
 		extension.createLazyConfiguration(Constants.Configurations.LOADER_DEPENDENCIES).configure(configuration -> configuration.setTransitive(false));
 		extension.createLazyConfiguration(Constants.Configurations.MINECRAFT).configure(configuration -> configuration.setTransitive(false));
 
-		if (project.getExtensions().getByType(LoomGradleExtension.class).isForge()) {
+		if (extension.isForge()) {
 			extension.createLazyConfiguration(Constants.Configurations.FORGE).configure(configuration -> configuration.setTransitive(false));
 			extension.createLazyConfiguration(Constants.Configurations.FORGE_USERDEV).configure(configuration -> configuration.setTransitive(false));
 			extension.createLazyConfiguration(Constants.Configurations.FORGE_INSTALLER).configure(configuration -> configuration.setTransitive(false));
@@ -96,7 +96,7 @@ public final class CompileConfiguration {
 			extendsFrom(JavaPlugin.TEST_RUNTIME_CLASSPATH_CONFIGURATION_NAME, Constants.Configurations.FORGE_NAMED, project);
 		}
 
-		if (project.getExtensions().getByType(LoomGradleExtension.class).supportsInclude()) {
+		if (extension.supportsInclude()) {
 			extension.createLazyConfiguration(Constants.Configurations.INCLUDE).configure(configuration -> configuration.setTransitive(false)); // Dont get transitive deps
 		}
 
diff --git a/src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java
index e1f60180..f8d45018 100644
--- a/src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java
+++ b/src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java
@@ -79,7 +79,7 @@ public class RemapConfiguration {
 
 		if (extension.isForge()) {
 			((Jar) jarTask).manifest(manifest -> {
-				manifest.attributes(ImmutableMap.of("MixinConfigs", String.join(",", extension.mixinConfigs)));
+				manifest.attributes(ImmutableMap.of("MixinConfigs", String.join(",", extension.getMixinConfigs())));
 			});
 		}
 
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 f3a83ef0..33aee980 100644
--- a/src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java
+++ b/src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java
@@ -28,6 +28,8 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 import java.util.Objects;
@@ -133,7 +135,7 @@ public class RunConfig {
 		if (extension.isForge()) {
 			List<String> modClasses = new ArrayList<>();
 
-			for (Supplier<SourceSet> sourceSetSupplier : extension.forgeLocalMods) {
+			for (Supplier<SourceSet> sourceSetSupplier : extension.getForgeLocalMods()) {
 				SourceSet sourceSet = sourceSetSupplier.get();
 				String sourceSetName = sourceSet.getName() + "_" + UUID.randomUUID().toString().replace("-", "").substring(0, 7);
 
@@ -214,7 +216,7 @@ public class RunConfig {
 		runConfig.programArgs = runConfig.programArgs.trim();
 		runConfig.vmArgs = runConfig.vmArgs.trim();
 
-		for (Consumer<RunConfig> consumer : extension.settingsPostEdit) {
+		for (Consumer<RunConfig> consumer : extension.getSettingsPostEdit()) {
 			consumer.accept(runConfig);
 		}
 
diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java
index 03a08d10..f0d2b3a1 100644
--- a/src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java
+++ b/src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java
@@ -93,13 +93,13 @@ public class LaunchProvider extends DependencyProvider {
 
 					.property("mixin.env.remapRefMap", "true");
 
-			if (getExtension().useFabricMixin) {
+			if (getExtension().isUseFabricMixin()) {
 				launchConfig.property("mixin.forgeloom.inject.mappings.srg-named", getExtension().getMappingsProvider().mixinTinyMappingsWithSrg.getAbsolutePath());
 			} else {
 				launchConfig.property("net.minecraftforge.gradle.GradleStart.srg.srg-mcp", getExtension().getMappingsProvider().srgToNamedSrg.getAbsolutePath());
 			}
 
-			List<String> mixinConfigs = getExtension().mixinConfigs;
+			List<String> mixinConfigs = getExtension().getMixinConfigs();
 
 			if (mixinConfigs != null) {
 				for (String config : mixinConfigs) {
diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUniversalProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUniversalProvider.java
index b12dc10f..5ad0555a 100644
--- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUniversalProvider.java
+++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUniversalProvider.java
@@ -42,7 +42,7 @@ public class ForgeUniversalProvider extends DependencyProvider {
 
 	@Override
 	public void provide(DependencyInfo dependency, Consumer<Runnable> postPopulationScheduler) throws Exception {
-		forge = new File(getExtension().getProjectPersistentCache(), "forge-" + dependency.getDependency().getVersion() + "-universal.jar");
+		forge = new File(getDirectories().getProjectPersistentCache(), "forge-" + dependency.getDependency().getVersion() + "-universal.jar");
 
 		if (!forge.exists() || isRefreshDeps()) {
 			File dep = dependency.resolveFile().orElseThrow(() -> new RuntimeException("Could not resolve Forge"));
diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUserdevProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUserdevProvider.java
index 50680cb9..26add71e 100644
--- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUserdevProvider.java
+++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUserdevProvider.java
@@ -52,9 +52,9 @@ public class ForgeUserdevProvider extends DependencyProvider {
 
 	@Override
 	public void provide(DependencyInfo dependency, Consumer<Runnable> postPopulationScheduler) throws Exception {
-		userdevJar = new File(getExtension().getProjectPersistentCache(), "forge-" + dependency.getDependency().getVersion() + "-userdev.jar");
+		userdevJar = new File(getDirectories().getProjectPersistentCache(), "forge-" + dependency.getDependency().getVersion() + "-userdev.jar");
 
-		Path configJson = getExtension()
+		Path configJson = getDirectories()
 				.getProjectPersistentCache()
 				.toPath()
 				.resolve("forge-config-" + dependency.getDependency().getVersion() + ".json");
@@ -80,7 +80,7 @@ public class ForgeUserdevProvider extends DependencyProvider {
 
 		for (JsonElement lib : json.get("libraries").getAsJsonArray()) {
 			if (lib.getAsString().startsWith("org.spongepowered:mixin:")) {
-				if (getExtension().useFabricMixin) {
+				if (getExtension().isUseFabricMixin()) {
 					addDependency("net.fabricmc:sponge-mixin:0.8.2+build.24", Constants.Configurations.FORGE_DEPENDENCIES);
 					continue;
 				}
diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/McpConfigProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/McpConfigProvider.java
index 037cf759..78375240 100644
--- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/McpConfigProvider.java
+++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/McpConfigProvider.java
@@ -58,7 +58,7 @@ public class McpConfigProvider extends DependencyProvider {
 	}
 
 	private void init(String version) {
-		mcp = new File(getExtension().getUserCache(), "mcp-" + version + ".zip");
+		mcp = new File(getDirectories().getUserCache(), "mcp-" + version + ".zip");
 	}
 
 	public File getMcp() {
diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java
index 8d8dd5bb..94ed967c 100644
--- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java
+++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java
@@ -127,8 +127,8 @@ public class MinecraftPatchedProvider extends DependencyProvider {
 
 	public void initFiles() throws IOException {
 		filesDirty = false;
-		projectAtHash = new File(getExtension().getProjectPersistentCache(), "at.sha256");
-		projectAts = getExtension().accessTransformers;
+		projectAtHash = new File(getDirectories().getProjectPersistentCache(), "at.sha256");
+		projectAts = getExtension().getAccessTransformers();
 
 		if (projectAts.isEmpty()) {
 			SourceSet main = getProject().getConvention().findPlugin(JavaPluginConvention.class).getSourceSets().getByName("main");
@@ -163,14 +163,14 @@ public class MinecraftPatchedProvider extends DependencyProvider {
 		String minecraftVersion = minecraftProvider.minecraftVersion();
 		String patchId = "forge-" + patchProvider.forgeVersion;
 
-		if (getExtension().useFabricMixin) {
+		if (getExtension().isUseFabricMixin()) {
 			patchId += "-fabric-mixin";
 		}
 
 		minecraftProvider.setJarSuffix(patchId);
 
-		File globalCache = getExtension().getUserCache();
-		File cache = usesProjectCache() ? getExtension().getProjectPersistentCache() : globalCache;
+		File globalCache = getDirectories().getUserCache();
+		File cache = usesProjectCache() ? getDirectories().getProjectPersistentCache() : globalCache;
 		File globalDir = new File(globalCache, patchId);
 		File projectDir = new File(cache, patchId);
 		globalDir.mkdirs();
diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/PatchProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/PatchProvider.java
index 63526372..2d6d8f46 100644
--- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/PatchProvider.java
+++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/PatchProvider.java
@@ -68,7 +68,7 @@ public class PatchProvider extends DependencyProvider {
 
 	private void init(String forgeVersion) {
 		this.forgeVersion = forgeVersion;
-		projectCacheFolder = getExtension().getProjectPersistentCache().toPath().resolve(forgeVersion);
+		projectCacheFolder = getDirectories().getProjectPersistentCache().toPath().resolve(forgeVersion);
 		clientPatches = projectCacheFolder.resolve("patches-client.lzma");
 		serverPatches = projectCacheFolder.resolve("patches-server.lzma");
 
diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/SrgProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/SrgProvider.java
index 88f79e26..b4cf837a 100644
--- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/SrgProvider.java
+++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/SrgProvider.java
@@ -64,7 +64,7 @@ public class SrgProvider extends DependencyProvider {
 	}
 
 	private void init(String version) {
-		srg = new File(getExtension().getUserCache(), "srg-" + version + ".tsrg");
+		srg = new File(getDirectories().getUserCache(), "srg-" + version + ".tsrg");
 	}
 
 	public File getSrg() {
diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/LayeredMappingSpecBuilder.java b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/LayeredMappingSpecBuilder.java
index 8b5a471d..2e5ed76a 100644
--- a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/LayeredMappingSpecBuilder.java
+++ b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/LayeredMappingSpecBuilder.java
@@ -31,7 +31,7 @@ import java.util.List;
 import org.gradle.api.Action;
 import org.jetbrains.annotations.Nullable;
 
-import net.fabricmc.loom.LoomGradleExtension;
+import net.fabricmc.loom.api.LoomGradleExtensionAPI;
 import net.fabricmc.loom.configuration.providers.mappings.crane.CraneMappingsSpec;
 import net.fabricmc.loom.configuration.providers.mappings.intermediary.IntermediaryMappingsSpec;
 import net.fabricmc.loom.configuration.providers.mappings.mojmap.MojangMappingsSpec;
@@ -40,9 +40,9 @@ import net.fabricmc.loom.configuration.providers.mappings.parchment.ParchmentMap
 public class LayeredMappingSpecBuilder {
 	private final List<MappingsSpec<?>> layers = new LinkedList<>();
 	@Nullable
-	private final LoomGradleExtension extension;
+	private final LoomGradleExtensionAPI extension;
 
-	public LayeredMappingSpecBuilder(LoomGradleExtension extension) {
+	public LayeredMappingSpecBuilder(@Nullable LoomGradleExtensionAPI extension) {
 		this.extension = extension;
 	}
 
diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java
index 6c6ceee5..b4bc6c52 100644
--- a/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java
+++ b/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java
@@ -159,7 +159,7 @@ public class MinecraftMappedProvider extends DependencyProvider {
 		addDependencies(dependency, postPopulationScheduler);
 
 		if (getExtension().isForge()) {
-			getProject().getRepositories().flatDir(repository -> repository.dir(new File(getJarDirectory(getExtension().getUserCache(), "mapped"), "forge")));
+			getProject().getRepositories().flatDir(repository -> repository.dir(new File(getJarDirectory(getDirectories().getUserCache(), "mapped"), "forge")));
 
 			getProject().getDependencies().add(Constants.Configurations.FORGE_NAMED,
 					getProject().getDependencies().module("net.minecraftforge-loom:forge:" + getJarVersionString("mapped")));
@@ -353,15 +353,15 @@ public class MinecraftMappedProvider extends DependencyProvider {
 	public void initFiles(MinecraftProviderImpl minecraftProvider, MappingsProviderImpl mappingsProvider) {
 		this.minecraftProvider = minecraftProvider;
 		minecraftIntermediaryJar = new File(getDirectories().getUserCache(), "minecraft-" + getJarVersionString("intermediary") + ".jar");
-		minecraftSrgJar = !getExtension().isForge() ? null : new File(getExtension().getUserCache(), "minecraft-" + getJarVersionString("srg") + ".jar");
+		minecraftSrgJar = !getExtension().isForge() ? null : new File(getDirectories().getUserCache(), "minecraft-" + getJarVersionString("srg") + ".jar");
 		minecraftMappedJar = new File(getJarDirectory(getDirectories().getUserCache(), "mapped"), "minecraft-" + getJarVersionString("mapped") + ".jar");
 		inputJar = getExtension().isForge() ? mappingsProvider.patchedProvider.getMergedJar() : minecraftProvider.getMergedJar();
 
 		if (getExtension().isForge()) {
 			inputForgeJar = mappingsProvider.patchedProvider.getForgeMergedJar();
-			forgeIntermediaryJar = new File(getExtension().getUserCache(), "forge-" + getJarVersionString("intermediary") + ".jar");
-			forgeSrgJar = new File(getExtension().getUserCache(), "forge-" + getJarVersionString("srg") + ".jar");
-			forgeMappedJar = new File(getJarDirectory(getExtension().getUserCache(), "mapped"), "forge/forge-" + getJarVersionString("mapped") + ".jar");
+			forgeIntermediaryJar = new File(getDirectories().getUserCache(), "forge-" + getJarVersionString("intermediary") + ".jar");
+			forgeSrgJar = new File(getDirectories().getUserCache(), "forge-" + getJarVersionString("srg") + ".jar");
+			forgeMappedJar = new File(getJarDirectory(getDirectories().getUserCache(), "mapped"), "forge/forge-" + getJarVersionString("mapped") + ".jar");
 		}
 	}
 
diff --git a/src/main/java/net/fabricmc/loom/configuration/sources/ForgeSourcesRemapper.java b/src/main/java/net/fabricmc/loom/configuration/sources/ForgeSourcesRemapper.java
index 4a30de59..db56ae5e 100644
--- a/src/main/java/net/fabricmc/loom/configuration/sources/ForgeSourcesRemapper.java
+++ b/src/main/java/net/fabricmc/loom/configuration/sources/ForgeSourcesRemapper.java
@@ -166,7 +166,7 @@ public class ForgeSourcesRemapper {
 	}
 
 	private static void remapForgeSourcesInner(Project project, Path tmpInput, Path tmpOutput) throws IOException {
-		LoomGradleExtension extension = project.getExtensions().getByType(LoomGradleExtension.class);
+		LoomGradleExtension extension = LoomGradleExtension.get(project);
 		Mercury mercury = SourceRemapper.createMercuryWithClassPath(project, false);
 
 		MappingSet mappings = new TinyMappingsReader(extension.getMappingsProvider().getMappingsWithSrg(), "srg", "named").read();