From 5ca71d9d1515a98a20d3e562d1878fb91f3f5154 Mon Sep 17 00:00:00 2001
From: modmuss50 <modmuss50@gmail.com>
Date: Wed, 31 Oct 2018 13:20:50 +0000
Subject: [PATCH] Map mods to intermediary

---
 src/main/java/net/fabricmc/loom/AbstractPlugin.java      | 6 +++---
 .../fabricmc/loom/mixin/ObfuscationServiceFabric.java    | 8 ++++----
 src/main/java/net/fabricmc/loom/util/ModProccessor.java  | 2 +-
 src/main/java/net/fabricmc/loom/util/ModRemapper.java    | 9 ++++++---
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/main/java/net/fabricmc/loom/AbstractPlugin.java b/src/main/java/net/fabricmc/loom/AbstractPlugin.java
index 5e275d5..e15e4e6 100644
--- a/src/main/java/net/fabricmc/loom/AbstractPlugin.java
+++ b/src/main/java/net/fabricmc/loom/AbstractPlugin.java
@@ -103,14 +103,14 @@ public class AbstractPlugin implements Plugin<Project> {
 						try {
 							javaCompileTask.getClasspath().add(target.files(this.getClass().getProtectionDomain().getCodeSource().getLocation()));
 
-							javaCompileTask.getOptions().getCompilerArgs().add("-AinMapFilePomfMojang=" + Constants.MAPPINGS_TINY.get(extension).getCanonicalPath());
-							javaCompileTask.getOptions().getCompilerArgs().add("-AoutMapFilePomfMojang=" + Constants.MAPPINGS_MIXIN_EXPORT.get(extension).getCanonicalPath());
+							javaCompileTask.getOptions().getCompilerArgs().add("-AinMapFilePomfIntermediary=" + Constants.MAPPINGS_TINY.get(extension).getCanonicalPath());
+							javaCompileTask.getOptions().getCompilerArgs().add("-AoutMapFilePomfIntermediary=" + Constants.MAPPINGS_MIXIN_EXPORT.get(extension).getCanonicalPath());
 							if(extension.refmapName == null || extension.refmapName.isEmpty()){
 								project.getLogger().error("Could not find refmap definition, will be using default name: " + project.getName() + "-refmap.json");
 								extension.refmapName = project.getName() + "-refmap.json";
 							}
 							javaCompileTask.getOptions().getCompilerArgs().add("-AoutRefMapFile=" + new File(javaCompileTask.getDestinationDir(), extension.refmapName).getCanonicalPath());
-							javaCompileTask.getOptions().getCompilerArgs().add("-AdefaultObfuscationEnv=pomf:mojang");
+							javaCompileTask.getOptions().getCompilerArgs().add("-AdefaultObfuscationEnv=pomf:intermediary");
 						} catch (IOException e) {
 							e.printStackTrace();
 						}
diff --git a/src/main/java/net/fabricmc/loom/mixin/ObfuscationServiceFabric.java b/src/main/java/net/fabricmc/loom/mixin/ObfuscationServiceFabric.java
index 2d4bd65..cafc540 100644
--- a/src/main/java/net/fabricmc/loom/mixin/ObfuscationServiceFabric.java
+++ b/src/main/java/net/fabricmc/loom/mixin/ObfuscationServiceFabric.java
@@ -60,16 +60,16 @@ public class ObfuscationServiceFabric implements IObfuscationService {
 	@Override
 	public Set<String> getSupportedOptions() {
 		ImmutableSet.Builder builder = new ImmutableSet.Builder();
-		addSupportedOptions(builder, "mojang", "pomf");
-		addSupportedOptions(builder, "pomf", "mojang");
+		addSupportedOptions(builder, "intermediary", "pomf");
+		addSupportedOptions(builder, "pomf", "intermediary");
 		return builder.build();
 	}
 
 	@Override
 	public Collection<ObfuscationTypeDescriptor> getObfuscationTypes() {
 		return ImmutableSet.of(
-			createObfuscationType("mojang", "pomf"),
-			createObfuscationType("pomf", "mojang")
+			createObfuscationType("intermediary", "pomf"),
+			createObfuscationType("pomf", "intermediary")
 		);
 	}
 }
diff --git a/src/main/java/net/fabricmc/loom/util/ModProccessor.java b/src/main/java/net/fabricmc/loom/util/ModProccessor.java
index 880c1dc..f314beb 100644
--- a/src/main/java/net/fabricmc/loom/util/ModProccessor.java
+++ b/src/main/java/net/fabricmc/loom/util/ModProccessor.java
@@ -59,7 +59,7 @@ public class ModProccessor {
 
 	private static void remapJar(File input, File output, Project project){
 		LoomGradleExtension extension = project.getExtensions().getByType(LoomGradleExtension.class);
-		String fromM = "mojang";
+		String fromM = "intermediary";
 		String toM = "pomf";
 
 		Path mappings = Constants.MAPPINGS_TINY.get(extension).toPath();
diff --git a/src/main/java/net/fabricmc/loom/util/ModRemapper.java b/src/main/java/net/fabricmc/loom/util/ModRemapper.java
index 965f510..e6a3d15 100644
--- a/src/main/java/net/fabricmc/loom/util/ModRemapper.java
+++ b/src/main/java/net/fabricmc/loom/util/ModRemapper.java
@@ -25,14 +25,17 @@
 package net.fabricmc.loom.util;
 
 import net.fabricmc.loom.LoomGradleExtension;
-import net.fabricmc.tinyremapper.*;
+import net.fabricmc.tinyremapper.OutputConsumerPath;
+import net.fabricmc.tinyremapper.TinyRemapper;
+import net.fabricmc.tinyremapper.TinyUtils;
 import org.apache.commons.io.FileUtils;
 import org.gradle.api.Project;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 public class ModRemapper {
 
@@ -60,7 +63,7 @@ public class ModRemapper {
 		Path mappings = Constants.MAPPINGS_TINY.get(extension).toPath();
 
 		String fromM = "pomf";
-		String toM = "mojang";
+		String toM = "intermediary";
 
 		List<File> classpathFiles = new ArrayList<>();
 		classpathFiles.addAll(project.getConfigurations().getByName("compile").getFiles());