From ee64d34bdb92eb477d5b40a2402515583b5e8a29 Mon Sep 17 00:00:00 2001
From: Juuxel <6596629+Juuxel@users.noreply.github.com>
Date: Wed, 2 Dec 2020 21:35:43 +0200
Subject: Revert unnecessary custom changes

---
 src/main/java/net/fabricmc/loom/AbstractPlugin.java                     | 2 +-
 .../net/fabricmc/loom/util/accesswidener/AccessWidenerJarProcessor.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main')

diff --git a/src/main/java/net/fabricmc/loom/AbstractPlugin.java b/src/main/java/net/fabricmc/loom/AbstractPlugin.java
index 78a26ab6..5077decc 100644
--- a/src/main/java/net/fabricmc/loom/AbstractPlugin.java
+++ b/src/main/java/net/fabricmc/loom/AbstractPlugin.java
@@ -288,9 +288,9 @@ public class AbstractPlugin implements Plugin<Project> {
 				if (!remapJarTask.getInput().isPresent()) {
 					jarTask.setClassifier("dev");
 					remapJarTask.setClassifier("");
+					remapJarTask.getInput().set(jarTask.getArchivePath());
 
 					if (extension.isForge()) {
-						remapJarTask.getInput().set(jarTask.getArchivePath());
 						remapJarTask.getToM().set("srg");
 					}
 				}
diff --git a/src/main/java/net/fabricmc/loom/util/accesswidener/AccessWidenerJarProcessor.java b/src/main/java/net/fabricmc/loom/util/accesswidener/AccessWidenerJarProcessor.java
index 04794b50..aa02c2d1 100644
--- a/src/main/java/net/fabricmc/loom/util/accesswidener/AccessWidenerJarProcessor.java
+++ b/src/main/java/net/fabricmc/loom/util/accesswidener/AccessWidenerJarProcessor.java
@@ -87,7 +87,7 @@ public class AccessWidenerJarProcessor implements JarProcessor {
 		//Remap accessWidener if its not named, allows for AE's to be written in intermediary
 		if (!accessWidener.getNamespace().equals("named")) {
 			try {
-				TinyRemapper tinyRemapper = loomGradleExtension.getMinecraftMappedProvider().getTinyRemapper("intermediary", "named");
+				TinyRemapper tinyRemapper = loomGradleExtension.getMinecraftMappedProvider().getTinyRemapper("official", "named");
 				tinyRemapper.readClassPath(loomGradleExtension.getMinecraftMappedProvider().getRemapClasspath());
 
 				AccessWidenerRemapper remapper = new AccessWidenerRemapper(accessWidener, tinyRemapper.getRemapper(), "named");
-- 
cgit