Reviews pt. 3

Author: TheGlitch76

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

@@ -71,18 +71,16 @@ public static String remapName(INameMappingService.Domain domain, String name) {
 			return name;
 		}
 
+		if (domain == INameMappingService.Domain.CLASS) {
+			return MAPPINGS.getDefaultNamespaceClassMap().get(name).getName(NAMED);
+		}
+
 		for (ClassDef classDef : MAPPINGS.getClasses()) {
-			if (domain == INameMappingService.Domain.CLASS) {
-				if (classDef.getName(INTERMEDIARY).equals(name)) {
-					return classDef.getName(NAMED);
-				}
-			} else {
-				boolean domainIsMethod = domain == INameMappingService.Domain.METHOD;
+			boolean domainIsMethod = domain == INameMappingService.Domain.METHOD;
 
-				for (Mapped mapped : domainIsMethod ? classDef.getMethods() : classDef.getFields()) {
-					if (mapped.getName(INTERMEDIARY).equals(name)) {
-						return mapped.getName(NAMED);
-					}
+			for (Mapped mapped : domainIsMethod ? classDef.getMethods() : classDef.getFields()) {
+				if (mapped.getName(INTERMEDIARY).equals(name)) {
+					return mapped.getName(NAMED);
 				}
 			}
 		}
@@ -99,14 +97,14 @@ public static String remapName(INameMappingService.Domain domain, String name) {
 	 * @return The remapped name, or the original name if it couldn't be remapped.
 	 */
 	public static String remapNameFast(INameMappingService.Domain domain, Class<?> clazz, String name) {
-		if (domain == INameMappingService.Domain.CLASS) {
-			remapName(domain, name);
-		}
-
 		if (FabricLoader.getInstance().getMappingResolver().getCurrentRuntimeNamespace().equals(INTERMEDIARY)) {
 			return name;
 		}
 
+		if (domain == INameMappingService.Domain.CLASS) {
+			remapName(domain, name);
+		}
+
 		ClassDef classDef = MAPPINGS.getDefaultNamespaceClassMap().get(clazz.getName());
 		boolean domainIsMethod = domain == INameMappingService.Domain.METHOD;