Final (hopefully) reviews

Author: TheGlitch76

patchwork-fml/src/main/java/com/patchworkmc/impl/fml/PatchworkMappingService.java

@@ -31,9 +31,10 @@
 import net.fabricmc.mapping.tree.TinyTree;
 
 public class PatchworkMappingService {
-	public static final TinyTree MAPPINGS = FabricLauncherBase.getLauncher().getMappingConfiguration().getMappings();
-	public static final String INTERMEDIARY = "intermediary";
-	public static final String NAMED = "named";
+	// We're technically messing with Loader's internal APIs here, if Loader ever gets a better mapping resolution system this class should be refactored.
+	private static final TinyTree MAPPINGS = FabricLauncherBase.getLauncher().getMappingConfiguration().getMappings();
+	private static final String INTERMEDIARY = "intermediary";
+	private static final String NAMED = "named";
 
 	private PatchworkMappingService() {
 		// NO-OP
@@ -48,7 +49,7 @@ private PatchworkMappingService() {
 	 */
 	@Nonnull
 	public static String remapName(INameMappingService.Domain domain, String name) {
-		if (FabricLoader.getInstance().getMappingResolver().getCurrentRuntimeNamespace().equals(INTERMEDIARY)) {
+		if (runtimeNamespaceIsIntermediary()) {
 			return name;
 		}
 
@@ -78,6 +79,10 @@ public static String remapName(INameMappingService.Domain domain, String name) {
 	 */
 	@Nonnull
 	public static String remapNameFast(INameMappingService.Domain domain, Class<?> clazz, String name) {
+		if (runtimeNamespaceIsIntermediary()) {
+			return name;
+		}
+
 		ClassDef classDef = MAPPINGS.getDefaultNamespaceClassMap().get(clazz.getName());
 		String remappedName = remapNameInternal(domain, classDef, name);
 
@@ -92,8 +97,8 @@ public static String remapNameFast(INameMappingService.Domain domain, Class<?> c
 	 * @return The remapped name, or null if it couldn't be remapped.
 	 */
 	@Nullable
-	public static String remapNameInternal(INameMappingService.Domain domain, ClassDef classDef, String name) {
-		if (FabricLoader.getInstance().getMappingResolver().getCurrentRuntimeNamespace().equals(INTERMEDIARY)) {
+	private static String remapNameInternal(INameMappingService.Domain domain, ClassDef classDef, String name) {
+		if (runtimeNamespaceIsIntermediary()) {
 			return name;
 		}
 
@@ -111,4 +116,8 @@ public static String remapNameInternal(INameMappingService.Domain domain, ClassD
 
 		return null;
 	}
+
+	private static boolean runtimeNamespaceIsIntermediary() {
+		return FabricLoader.getInstance().getMappingResolver().getCurrentRuntimeNamespace().equals(INTERMEDIARY);
+	}
 }

patchwork-fml/src/main/java/net/minecraftforge/fml/common/ObfuscationReflectionHelper.java

@@ -49,7 +49,6 @@
 public class ObfuscationReflectionHelper {
 	private static final Logger LOGGER = LogManager.getLogger();
 	private static final Marker REFLECTION = MarkerManager.getMarker("REFLECTION");
-	// We're technically messing with Loader's internal APIs here, if Loader ever gets a better mapping resolution system this class should be refactored.
 
 	/**
 	 * Remaps a name from intermediary to whatever is currently being used at runtime.