From f9a06cbd419eeb10dd86e80ea1c5c84613617af4 Mon Sep 17 00:00:00 2001
From: Juuxel <6596629+Juuxel@users.noreply.github.com>
Date: Sun, 1 Aug 2021 01:45:43 +0300
Subject: [PATCH] Make RemapSourcesJarTask use properties (#459)

---
 .../configuration/RemapConfiguration.java     |  4 +-
 .../loom/task/RemapSourcesJarTask.java        | 55 ++++++-------------
 2 files changed, 20 insertions(+), 39 deletions(-)

diff --git a/src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java
index f3c16aef..abd61bd0 100644
--- a/src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java
+++ b/src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java
@@ -139,8 +139,8 @@ public class RemapConfiguration {
 
 			RemapSourcesJarTask remapSourcesJarTask = (RemapSourcesJarTask) project.getTasks().findByName(remapSourcesJarTaskName);
 			Preconditions.checkNotNull(remapSourcesJarTask, "Could not find " + remapSourcesJarTaskName + " in " + project.getName());
-			remapSourcesJarTask.setInput(sourcesTask.getArchivePath());
-			remapSourcesJarTask.setOutput(sourcesTask.getArchivePath());
+			remapSourcesJarTask.getInput().set(sourcesTask.getArchiveFile());
+			remapSourcesJarTask.getOutput().set(sourcesTask.getArchiveFile());
 			remapSourcesJarTask.dependsOn(project.getTasks().getByName(sourcesJarTaskName));
 
 			if (isDefaultRemap) {
diff --git a/src/main/java/net/fabricmc/loom/task/RemapSourcesJarTask.java b/src/main/java/net/fabricmc/loom/task/RemapSourcesJarTask.java
index dcdfbbbd..858c7ec1 100644
--- a/src/main/java/net/fabricmc/loom/task/RemapSourcesJarTask.java
+++ b/src/main/java/net/fabricmc/loom/task/RemapSourcesJarTask.java
@@ -24,8 +24,8 @@
 
 package net.fabricmc.loom.task;
 
-import java.io.File;
-
+import org.gradle.api.file.RegularFileProperty;
+import org.gradle.api.provider.Property;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.InputFile;
 import org.gradle.api.tasks.Internal;
@@ -35,12 +35,12 @@ import org.gradle.api.tasks.TaskAction;
 import net.fabricmc.loom.util.SourceRemapper;
 
 public class RemapSourcesJarTask extends AbstractLoomTask {
-	private Object input;
-	private Object output;
-	private String direction = "intermediary";
+	private final RegularFileProperty input = getProject().getObjects().fileProperty();
+	private final RegularFileProperty output = getProject().getObjects().fileProperty().convention(input);
+	private final Property<String> targetNamespace = getProject().getObjects().property(String.class).convention("intermediary");
 	private SourceRemapper sourceRemapper = null;
-	private boolean preserveFileTimestamps = true;
-	private boolean reproducibleFileOrder = false;
+	private final Property<Boolean> preserveFileTimestamps = getProject().getObjects().property(Boolean.class).convention(true);
+	private final Property<Boolean> reproducibleFileOrder = getProject().getObjects().property(Boolean.class).convention(false);
 
 	public RemapSourcesJarTask() {
 	}
@@ -48,9 +48,10 @@ public class RemapSourcesJarTask extends AbstractLoomTask {
 	@TaskAction
 	public void remap() throws Exception {
 		if (sourceRemapper == null) {
-			SourceRemapper.remapSources(getProject(), getInput(), getOutput(), direction.equals("named"), reproducibleFileOrder, preserveFileTimestamps);
+			String direction = targetNamespace.get();
+			SourceRemapper.remapSources(getProject(), input.get().getAsFile(), output.get().getAsFile(), direction.equals("named"), reproducibleFileOrder.get(), preserveFileTimestamps.get());
 		} else {
-			sourceRemapper.scheduleRemapSources(getInput(), getOutput(), reproducibleFileOrder, preserveFileTimestamps);
+			sourceRemapper.scheduleRemapSources(input.get().getAsFile(), output.get().getAsFile(), reproducibleFileOrder.get(), preserveFileTimestamps.get());
 		}
 	}
 
@@ -65,47 +66,27 @@ public class RemapSourcesJarTask extends AbstractLoomTask {
 	}
 
 	@InputFile
-	public File getInput() {
-		return getProject().file(input);
+	public RegularFileProperty getInput() {
+		return input;
 	}
 
 	@OutputFile
-	public File getOutput() {
-		return getProject().file(output == null ? input : output);
+	public RegularFileProperty getOutput() {
+		return output;
 	}
 
 	@Input
-	public String getTargetNamespace() {
-		return direction;
-	}
-
-	public void setInput(Object input) {
-		this.input = input;
-	}
-
-	public void setOutput(Object output) {
-		this.output = output;
-	}
-
-	public void setTargetNamespace(String value) {
-		this.direction = value;
+	public Property<String> getTargetNamespace() {
+		return targetNamespace;
 	}
 
 	@Input
-	public boolean isPreserveFileTimestamps() {
+	public Property<Boolean> getPreserveFileTimestamps() {
 		return preserveFileTimestamps;
 	}
 
-	public void setPreserveFileTimestamps(boolean preserveFileTimestamps) {
-		this.preserveFileTimestamps = preserveFileTimestamps;
-	}
-
 	@Input
-	public boolean isReproducibleFileOrder() {
+	public Property<Boolean> getReproducibleFileOrder() {
 		return reproducibleFileOrder;
 	}
-
-	public void setReproducibleFileOrder(boolean reproducibleFileOrder) {
-		this.reproducibleFileOrder = reproducibleFileOrder;
-	}
 }