extends directly from the original task

Legacy-Fabric · Jul 12, 2023 · a2eece6 · a2eece6
1 parent bfb9e50
commit a2eece6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 45 deletions.
diff --git a/multi-filament/src/main/java/net/legacyfabric/multifilament/MultiFilamentGradlePlugin.java b/multi-filament/src/main/java/net/legacyfabric/multifilament/MultiFilamentGradlePlugin.java
@@ -14,6 +14,7 @@ public void apply(Project project) {
 		TaskContainer tasks = project.getTasks();
 		CombineUnpickDefinitionsTask combineUnpickDefinitions = (CombineUnpickDefinitionsTask) tasks.getByName("combineUnpickDefinitions");
 		tasks.register("fixedRemapUnpickDefinitionsIntermediary", FixedRemapUnpickDefinitionsTask.class, (task) -> {
+			task.setGroup("multi-filament");
 			task.dependsOn(combineUnpickDefinitions);
 			task.getInput().set(combineUnpickDefinitions.getOutput());
 			task.getSourceNamespace().set("named");

diff --git a/...nt/src/main/java/net/legacyfabric/multifilament/task/FixedRemapUnpickDefinitionsTask.java b/...nt/src/main/java/net/legacyfabric/multifilament/task/FixedRemapUnpickDefinitionsTask.java
@@ -6,23 +6,16 @@
 import daomephsta.unpick.constantmappers.datadriven.parser.v2.UnpickV2Remapper;
 import daomephsta.unpick.constantmappers.datadriven.parser.v2.UnpickV2Writer;
 
+import net.fabricmc.filament.task.RemapUnpickDefinitionsTask;
 import net.fabricmc.filament.util.FileUtil;
 import net.fabricmc.filament.util.UnpickUtil;
 import net.fabricmc.mappingio.MappingReader;
 import net.fabricmc.mappingio.tree.MappingTree;
 import net.fabricmc.mappingio.tree.MemoryMappingTree;
 
-import org.gradle.api.DefaultTask;
-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.OutputFile;
 import org.gradle.api.tasks.TaskAction;
 import org.gradle.workers.WorkAction;
-import org.gradle.workers.WorkParameters;
 import org.gradle.workers.WorkQueue;
-import org.gradle.workers.WorkerExecutor;
 
 import javax.inject.Inject;
 
@@ -34,29 +27,12 @@
 import java.util.Iterator;
 import java.util.Map;
 
-public abstract class FixedRemapUnpickDefinitionsTask extends DefaultTask {
+public abstract class FixedRemapUnpickDefinitionsTask extends RemapUnpickDefinitionsTask {
 	public FixedRemapUnpickDefinitionsTask() {
 	}
 
-	@InputFile
-	public abstract RegularFileProperty getInput();
-
-	@InputFile
-	public abstract RegularFileProperty getMappings();
-
-	@Input
-	public abstract Property<String> getSourceNamespace();
-
-	@Input
-	public abstract Property<String> getTargetNamespace();
-
-	@OutputFile
-	public abstract RegularFileProperty getOutput();
-
-	@Inject
-	protected abstract WorkerExecutor getWorkerExecutor();
-
 	@TaskAction
+	@Override
 	public void run() {
 		WorkQueue workQueue = this.getWorkerExecutor().noIsolation();
 		workQueue.submit(FixedRemapUnpickDefinitionsTask.RemapAction.class, (parameters) -> {
@@ -68,7 +44,7 @@ public void run() {
 		});
 	}
 
-	public abstract static class RemapAction implements WorkAction<FixedRemapUnpickDefinitionsTask.RemapParameters> {
+	public abstract static class RemapAction implements WorkAction<RemapUnpickDefinitionsTask.RemapParameters> {
 		@Inject
 		public RemapAction() {
 		}
@@ -135,21 +111,4 @@ public void execute() {
 			}
 		}
 	}
-
-	public interface RemapParameters extends WorkParameters {
-		@InputFile
-		RegularFileProperty getInput();
-
-		@InputFile
-		RegularFileProperty getMappings();
-
-		@Input
-		Property<String> getSourceNamespace();
-
-		@Input
-		Property<String> getTargetNamespace();
-
-		@OutputFile
-		RegularFileProperty getOutput();
-	}
 }