From e55763aca2268930973b090765ae195b0a9f4be8 Mon Sep 17 00:00:00 2001
From: NinjaPhenix <5214513+NinjaPhenix@users.noreply.github.com>
Date: Mon, 4 Oct 2021 21:37:48 +0100
Subject: [PATCH] Use conventions in RemapConfiguration to avoid need for
 afterEvaluate. (#514)

---
 .../loom/configuration/RemapConfiguration.java         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java
index cf6d1e9..03d19e3 100644
--- a/src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java
+++ b/src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java
@@ -107,9 +107,9 @@ public class RemapConfiguration {
 		assert remapJarTask != null;
 
 		if (!remapJarTask.getInput().isPresent() && isDefaultRemap) {
-			jarTask.setClassifier("dev");
-			remapJarTask.setClassifier("");
-			remapJarTask.getInput().set(jarTask.getArchivePath());
+			jarTask.getArchiveClassifier().convention("dev");
+			remapJarTask.getArchiveClassifier().convention("");
+			remapJarTask.getInput().convention(jarTask.getArchiveFile());
 		}
 
 		if (isDefaultRemap) {
@@ -177,8 +177,8 @@ public class RemapConfiguration {
 
 			RemapSourcesJarTask remapSourcesJarTask = (RemapSourcesJarTask) project.getTasks().findByName(remapSourcesJarTaskName);
 			Preconditions.checkNotNull(remapSourcesJarTask, "Could not find " + remapSourcesJarTaskName + " in " + project.getName());
-			remapSourcesJarTask.getInput().set(sourcesTask.getArchiveFile());
-			remapSourcesJarTask.getOutput().set(sourcesTask.getArchiveFile());
+			remapSourcesJarTask.getInput().convention(sourcesTask.getArchiveFile());
+			remapSourcesJarTask.getOutput().convention(sourcesTask.getArchiveFile());
 			remapSourcesJarTask.dependsOn(project.getTasks().getByName(sourcesJarTaskName));
 
 			if (isDefaultRemap) {