From 296eb63645750f87788896cff26561defb067e42 Mon Sep 17 00:00:00 2001
From: modmuss50 <modmuss50@gmail.com>
Date: Sun, 28 Jun 2020 12:51:29 +0100
Subject: [PATCH] small cleanup

---
 .../net/fabricmc/loom/AbstractPlugin.java     |  6 ++--
 .../{shared => }/RemapAllSourcesTask.java     |  8 +++--
 .../loom/task/shared/RemapAllJarsTask.java    | 30 -------------------
 3 files changed, 9 insertions(+), 35 deletions(-)
 rename src/main/java/net/fabricmc/loom/task/{shared => }/RemapAllSourcesTask.java (93%)
 delete mode 100644 src/main/java/net/fabricmc/loom/task/shared/RemapAllJarsTask.java

diff --git a/src/main/java/net/fabricmc/loom/AbstractPlugin.java b/src/main/java/net/fabricmc/loom/AbstractPlugin.java
index 8c2944b..7519777 100644
--- a/src/main/java/net/fabricmc/loom/AbstractPlugin.java
+++ b/src/main/java/net/fabricmc/loom/AbstractPlugin.java
@@ -53,10 +53,10 @@ import net.fabricmc.loom.providers.LaunchProvider;
 import net.fabricmc.loom.providers.MappingsProvider;
 import net.fabricmc.loom.providers.MinecraftProvider;
 import net.fabricmc.loom.providers.MappingsCache;
+import net.fabricmc.loom.task.AbstractLoomTask;
 import net.fabricmc.loom.task.RemapJarTask;
 import net.fabricmc.loom.task.RemapSourcesJarTask;
-import net.fabricmc.loom.task.shared.RemapAllJarsTask;
-import net.fabricmc.loom.task.shared.RemapAllSourcesTask;
+import net.fabricmc.loom.task.RemapAllSourcesTask;
 import net.fabricmc.loom.util.Constants;
 import net.fabricmc.loom.util.GroovyXmlUtil;
 import net.fabricmc.loom.util.LoomDependencyManager;
@@ -292,7 +292,7 @@ public class AbstractPlugin implements Plugin<Project> {
 
 						parentTask = rootProject.getTasks().getByName("remapAllSources");
 
-						rootProject.getTasks().register("remapAllJars", RemapAllJarsTask.class, task -> {
+						rootProject.getTasks().register("remapAllJars", AbstractLoomTask.class, task -> {
 							task.doLast(t -> {
 								try {
 									jarRemapper.remap();
diff --git a/src/main/java/net/fabricmc/loom/task/shared/RemapAllSourcesTask.java b/src/main/java/net/fabricmc/loom/task/RemapAllSourcesTask.java
similarity index 93%
rename from src/main/java/net/fabricmc/loom/task/shared/RemapAllSourcesTask.java
rename to src/main/java/net/fabricmc/loom/task/RemapAllSourcesTask.java
index 709a6a0..68fe655 100644
--- a/src/main/java/net/fabricmc/loom/task/shared/RemapAllSourcesTask.java
+++ b/src/main/java/net/fabricmc/loom/task/RemapAllSourcesTask.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package net.fabricmc.loom.task.shared;
+package net.fabricmc.loom.task;
 
 import org.gradle.api.tasks.Internal;
 
@@ -30,6 +30,10 @@ import net.fabricmc.loom.task.AbstractLoomTask;
 import net.fabricmc.loom.util.SourceRemapper;
 
 public class RemapAllSourcesTask extends AbstractLoomTask {
-	@Internal
 	public SourceRemapper sourceRemapper;
+
+	@Internal
+	public SourceRemapper getSourceRemapper() {
+		return sourceRemapper;
+	}
 }
diff --git a/src/main/java/net/fabricmc/loom/task/shared/RemapAllJarsTask.java b/src/main/java/net/fabricmc/loom/task/shared/RemapAllJarsTask.java
deleted file mode 100644
index 36904fa..0000000
--- a/src/main/java/net/fabricmc/loom/task/shared/RemapAllJarsTask.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * This file is part of fabric-loom, licensed under the MIT License (MIT).
- *
- * Copyright (c) 2016, 2017, 2018 FabricMC
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package net.fabricmc.loom.task.shared;
-
-import net.fabricmc.loom.task.AbstractLoomTask;
-
-public class RemapAllJarsTask extends AbstractLoomTask {
-}