Clean up ternary operators a bit

TheGlitch76 · TheGlitch76 · commit b6f865272c34 · 2020-02-01T17:32:36.000-06:00
diff --git a/patchwork-fml/src/main/java/net/minecraftforge/fml/common/ObfuscationReflectionHelper.java b/patchwork-fml/src/main/java/net/minecraftforge/fml/common/ObfuscationReflectionHelper.java
@@ -77,7 +77,9 @@ public static String remapName(INameMappingService.Domain domain, String name) {
 					return classDef.getName(NAMED);
 				}
 			} else {
-				for (Mapped mapped : domain == INameMappingService.Domain.METHOD ? classDef.getMethods() : classDef.getFields()) {
+				boolean domainIsMethod = domain == INameMappingService.Domain.METHOD;
+
+				for (Mapped mapped : domainIsMethod ? classDef.getMethods() : classDef.getFields()) {
 					if (mapped.getName(INTERMEDIARY).equals(name)) {
 						return mapped.getName(NAMED);
 					}
@@ -106,8 +108,9 @@ public static String remapNameFast(INameMappingService.Domain domain, Class<?> c
 		}
 
 		ClassDef classDef = MAPPINGS.getDefaultNamespaceClassMap().get(clazz.getName());
+		boolean domainIsMethod = domain == INameMappingService.Domain.METHOD;
 
-		for (Mapped mapped : domain == INameMappingService.Domain.METHOD ? classDef.getMethods() : classDef.getFields()) {
+		for (Mapped mapped : domainIsMethod ? classDef.getMethods() : classDef.getFields()) {
 			if (mapped.getName(INTERMEDIARY).equals(name)) {
 				return mapped.getName(NAMED);
 			}

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,9 @@ public static String remapName(INameMappingService.Domain domain, String name) {`
`77`	`77`	`return classDef.getName(NAMED);`
`78`	`78`	`}`
`79`	`79`	`} else {`
`80`		`- for (Mapped mapped : domain == INameMappingService.Domain.METHOD ? classDef.getMethods() : classDef.getFields()) {`
	`80`	`+ boolean domainIsMethod = domain == INameMappingService.Domain.METHOD;`
	`81`	`+`
	`82`	`+ for (Mapped mapped : domainIsMethod ? classDef.getMethods() : classDef.getFields()) {`
`81`	`83`	`if (mapped.getName(INTERMEDIARY).equals(name)) {`
`82`	`84`	`return mapped.getName(NAMED);`
`83`	`85`	`}`
`@@ -106,8 +108,9 @@ public static String remapNameFast(INameMappingService.Domain domain, Class<?> c`
`106`	`108`	`}`
`107`	`109`
`108`	`110`	`ClassDef classDef = MAPPINGS.getDefaultNamespaceClassMap().get(clazz.getName());`
	`111`	`+ boolean domainIsMethod = domain == INameMappingService.Domain.METHOD;`
`109`	`112`
`110`		`- for (Mapped mapped : domain == INameMappingService.Domain.METHOD ? classDef.getMethods() : classDef.getFields()) {`
	`113`	`+ for (Mapped mapped : domainIsMethod ? classDef.getMethods() : classDef.getFields()) {`
`111`	`114`	`if (mapped.getName(INTERMEDIARY).equals(name)) {`
`112`	`115`	`return mapped.getName(NAMED);`
`113`	`116`	`}`