From 3655421422195a773f4da50892d98a10652f3815 Mon Sep 17 00:00:00 2001
From: Juuxel <6596629+Juuxel@users.noreply.github.com>
Date: Thu, 3 Dec 2020 22:16:16 +0200
Subject: [PATCH] Add javax annotations for Forge

Forge uses the "default" annotations such as ParametersAreNonnullByDefault.
---
 .../loom/providers/LaunchProvider.java        |  4 ++++
 .../providers/MinecraftMappedProvider.java    | 21 ++++++++++++-------
 .../net/fabricmc/loom/util/Constants.java     |  2 ++
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/main/java/net/fabricmc/loom/providers/LaunchProvider.java b/src/main/java/net/fabricmc/loom/providers/LaunchProvider.java
index 89efb95b..a2aafaba 100644
--- a/src/main/java/net/fabricmc/loom/providers/LaunchProvider.java
+++ b/src/main/java/net/fabricmc/loom/providers/LaunchProvider.java
@@ -105,6 +105,10 @@ public class LaunchProvider extends DependencyProvider {
 		addDependency(Constants.Dependencies.TERMINAL_CONSOLE_APPENDER + Constants.Dependencies.Versions.TERMINAL_CONSOLE_APPENDER, "runtimeOnly");
 		annotationDependency = addDependency(Constants.Dependencies.JETBRAINS_ANNOTATIONS + Constants.Dependencies.Versions.JETBRAINS_ANNOTATIONS, "compileOnly");
 
+		if (getExtension().isForge()) {
+			addDependency(Constants.Dependencies.JAVAX_ANNOTATIONS + Constants.Dependencies.Versions.JAVAX_ANNOTATIONS, "compileOnly");
+		}
+
 		postPopulationScheduler.accept(this::writeRemapClassPath);
 	}
 
diff --git a/src/main/java/net/fabricmc/loom/providers/MinecraftMappedProvider.java b/src/main/java/net/fabricmc/loom/providers/MinecraftMappedProvider.java
index 0fd3380e..9a5b3cb2 100644
--- a/src/main/java/net/fabricmc/loom/providers/MinecraftMappedProvider.java
+++ b/src/main/java/net/fabricmc/loom/providers/MinecraftMappedProvider.java
@@ -182,16 +182,21 @@ public class MinecraftMappedProvider extends DependencyProvider {
 	}
 
 	public TinyRemapper getTinyRemapper(String fromM, String toM) throws IOException {
-		return TinyRemapper.newRemapper()
+		TinyRemapper.Builder builder = TinyRemapper.newRemapper()
 				.withMappings(TinyRemapperMappingsHelper.create(getExtension().getMappingsProvider().getMappings(), fromM, toM, true))
-				.withMappings(out -> JSR_TO_JETBRAINS.forEach(out::acceptClass))
 				.renameInvalidLocals(true)
-				.rebuildSourceFilenames(true)
-				/* FORGE: Required for classes like aej$OptionalNamedTag (1.16.4) which are added by Forge patches.
-				 * They won't get remapped to their proper packages, so IllegalAccessErrors will happen without ._.
-				 */
-				.fixPackageAccess(true)
-				.build();
+				.rebuildSourceFilenames(true);
+
+		if (getExtension().isForge()) {
+			/* FORGE: Required for classes like aej$OptionalNamedTag (1.16.4) which are added by Forge patches.
+			 * They won't get remapped to their proper packages, so IllegalAccessErrors will happen without ._.
+			 */
+			builder.fixPackageAccess(true);
+		} else {
+			builder.withMappings(out -> JSR_TO_JETBRAINS.forEach(out::acceptClass));
+		}
+
+		return builder.build();
 	}
 
 	public Path[] getRemapClasspath() {
diff --git a/src/main/java/net/fabricmc/loom/util/Constants.java b/src/main/java/net/fabricmc/loom/util/Constants.java
index c0906c02..fefeff41 100644
--- a/src/main/java/net/fabricmc/loom/util/Constants.java
+++ b/src/main/java/net/fabricmc/loom/util/Constants.java
@@ -80,6 +80,7 @@ public class Constants {
 		public static final String DEV_LAUNCH_INJECTOR = "net.fabricmc:dev-launch-injector:";
 		public static final String TERMINAL_CONSOLE_APPENDER = "net.minecrell:terminalconsoleappender:";
 		public static final String JETBRAINS_ANNOTATIONS = "org.jetbrains:annotations:";
+		public static final String JAVAX_ANNOTATIONS = "com.google.code.findbugs:jsr305:"; // I hate that I have to add these.
 
 		private Dependencies() {
 		}
@@ -92,6 +93,7 @@ public class Constants {
 			public static final String DEV_LAUNCH_INJECTOR = "0.2.1+build.8";
 			public static final String TERMINAL_CONSOLE_APPENDER = "1.2.0";
 			public static final String JETBRAINS_ANNOTATIONS = "19.0.0";
+			public static final String JAVAX_ANNOTATIONS = "3.0.2";
 
 			private Versions() {
 			}