From 58e94f2db315f029764265c0a22779299dd9e463 Mon Sep 17 00:00:00 2001
From: modmuss50 <modmuss50@gmail.com>
Date: Tue, 19 Jan 2021 21:58:39 +0000
Subject: [PATCH] Centralise refreshDeps variable. Makes it easier to hack it
 to always enable for profiling.

---
 .../java/net/fabricmc/loom/build/ModCompileRemapper.java   | 7 +++----
 .../fabricmc/loom/configuration/DependencyProvider.java    | 3 ++-
 .../fabricmc/loom/configuration/LoomDependencyManager.java | 2 +-
 .../providers/mappings/MojangMappingsDependency.java       | 3 ++-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java b/src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java
index c257a69..5def378 100644
--- a/src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java
+++ b/src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java
@@ -45,6 +45,7 @@ import org.gradle.jvm.JvmLibrary;
 import org.gradle.language.base.artifact.SourcesArtifact;
 
 import net.fabricmc.loom.LoomGradleExtension;
+import net.fabricmc.loom.LoomGradlePlugin;
 import net.fabricmc.loom.configuration.RemappedConfigurationEntry;
 import net.fabricmc.loom.configuration.mods.ModProcessor;
 import net.fabricmc.loom.configuration.processors.dependency.ModDependencyInfo;
@@ -57,7 +58,7 @@ public class ModCompileRemapper {
 	public static void remapDependencies(Project project, String mappingsSuffix, LoomGradleExtension extension, SourceRemapper sourceRemapper) {
 		Logger logger = project.getLogger();
 		DependencyHandler dependencies = project.getDependencies();
-		boolean refreshDeps = project.getGradle().getStartParameter().isRefreshDependencies();
+		boolean refreshDeps = LoomGradlePlugin.refreshDeps;
 
 		final File modStore = extension.getRemappedModCache();
 		final RemapData remapData = new RemapData(mappingsSuffix, modStore);
@@ -169,9 +170,7 @@ public class ModCompileRemapper {
 	private static void scheduleSourcesRemapping(Project project, SourceRemapper sourceRemapper, File sources, String remappedLog, File remappedSources) {
 		project.getLogger().debug(":providing " + remappedLog + " sources");
 
-		boolean refreshDeps = project.getGradle().getStartParameter().isRefreshDependencies();
-
-		if (!remappedSources.exists() || sources.lastModified() <= 0 || sources.lastModified() > remappedSources.lastModified() || refreshDeps) {
+		if (!remappedSources.exists() || sources.lastModified() <= 0 || sources.lastModified() > remappedSources.lastModified() || LoomGradlePlugin.refreshDeps) {
 			sourceRemapper.scheduleRemapSources(sources, remappedSources, false, true); // Depenedency sources are used in ide only so don't need to be reproducable
 		} else {
 			project.getLogger().info(remappedSources.getName() + " is up to date with " + sources.getName());
diff --git a/src/main/java/net/fabricmc/loom/configuration/DependencyProvider.java b/src/main/java/net/fabricmc/loom/configuration/DependencyProvider.java
index cc1c6d4..63ef835 100644
--- a/src/main/java/net/fabricmc/loom/configuration/DependencyProvider.java
+++ b/src/main/java/net/fabricmc/loom/configuration/DependencyProvider.java
@@ -48,6 +48,7 @@ import org.gradle.api.artifacts.SelfResolvingDependency;
 import org.zeroturnaround.zip.ZipUtil;
 
 import net.fabricmc.loom.LoomGradleExtension;
+import net.fabricmc.loom.LoomGradlePlugin;
 
 public abstract class DependencyProvider {
 	private LoomDependencyManager dependencyManager;
@@ -88,7 +89,7 @@ public abstract class DependencyProvider {
 	}
 
 	public boolean isRefreshDeps() {
-		return getProject().getGradle().getStartParameter().isRefreshDependencies();
+		return LoomGradlePlugin.refreshDeps;
 	}
 
 	public static class DependencyInfo {
diff --git a/src/main/java/net/fabricmc/loom/configuration/LoomDependencyManager.java b/src/main/java/net/fabricmc/loom/configuration/LoomDependencyManager.java
index 5397794..397908c 100644
--- a/src/main/java/net/fabricmc/loom/configuration/LoomDependencyManager.java
+++ b/src/main/java/net/fabricmc/loom/configuration/LoomDependencyManager.java
@@ -130,7 +130,7 @@ public class LoomDependencyManager {
 					try {
 						provider.provide(info, afterTasks::add);
 					} catch (Exception e) {
-						throw new RuntimeException("Failed to provide " + dependency.getGroup() + ":" + dependency.getName() + ":" + dependency.getVersion() + " : " + e.getMessage(), e);
+						throw new RuntimeException("Failed to provide " + dependency.getGroup() + ":" + dependency.getName() + ":" + dependency.getVersion() + " : " + e.toString(), e);
 					}
 				}
 			}
diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MojangMappingsDependency.java b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MojangMappingsDependency.java
index b86e04f..2266495 100644
--- a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MojangMappingsDependency.java
+++ b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MojangMappingsDependency.java
@@ -54,6 +54,7 @@ import org.zeroturnaround.zip.ZipEntrySource;
 import org.zeroturnaround.zip.ZipUtil;
 
 import net.fabricmc.loom.LoomGradleExtension;
+import net.fabricmc.loom.LoomGradlePlugin;
 import net.fabricmc.loom.configuration.providers.minecraft.MinecraftVersionInfo;
 import net.fabricmc.loom.util.DownloadUtil;
 import net.fabricmc.lorenztiny.TinyMappingsReader;
@@ -81,7 +82,7 @@ public class MojangMappingsDependency implements SelfResolvingDependency {
 		Path clientMappings = mappingsDir.resolve(String.format("%s.%s-%s-client.map", GROUP, MODULE, getVersion()));
 		Path serverMappings = mappingsDir.resolve(String.format("%s.%s-%s-server.map", GROUP, MODULE, getVersion()));
 
-		if (!Files.exists(mappingsFile) || project.getGradle().getStartParameter().isRefreshDependencies()) {
+		if (!Files.exists(mappingsFile) || LoomGradlePlugin.refreshDeps) {
 			MappingSet mappingSet;
 
 			try {