Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2

core/crash/CrashEnhancement.java

@@ -7,51 +7,47 @@ import cpw.mods.fml.common.ICrashCallable;
 public class CrashEnhancement implements ICrashCallable
 {
 
-	final CrashInfo Output;
+	private final String name;
+	private final String value;
 
-	final String ModVersion = AEConfig.CHANNEL + " " + AEConfig.VERSION + " for Forge " + // WHAT?
+	private final String ModVersion = AEConfig.CHANNEL + " " + AEConfig.VERSION + " for Forge " + // WHAT?
 			net.minecraftforge.common.ForgeVersion.majorVersion + "." // majorVersion
 			+ net.minecraftforge.common.ForgeVersion.minorVersion + "." // minorVersion
 			+ net.minecraftforge.common.ForgeVersion.revisionVersion + "." // revisionVersion
 			+ net.minecraftforge.common.ForgeVersion.buildVersion;
 
-	final String IntegrationInfo;
+	public CrashEnhancement(CrashInfo Output) {
-
+		
-	public CrashEnhancement(CrashInfo ci) {
+		if ( Output == CrashInfo.MOD_VERSION )
-		Output = ci;
+		{
-
+			name = "AE2 Version";
-		if ( IntegrationRegistry.instance != null )
+			value = ModVersion;
-			IntegrationInfo = IntegrationRegistry.instance.getStatus();
+		}
+		else if ( Output == CrashInfo.INTEGRATION )
+		{
+			name ="AE2 Integration";
+			if ( IntegrationRegistry.instance != null )
+				value = IntegrationRegistry.instance.getStatus();
+			else
+				value = "N/A";
+		}
 		else
-			IntegrationInfo = "N/A";
+		{
+			name = "AE2_UNKNOWN";
+			value = "UNKNOWN_VALUE";
+		}
 	}
 
 	@Override
 	public String call() throws Exception
 	{
-		switch (Output)
+		return value;
-		{
-		case MOD_VERSION:
-			return ModVersion;
-		case INTEGRATION:
-			return IntegrationInfo;
-		}
-
-		return "UNKNOWN_VALUE";
 	}
 
 	@Override
 	public String getLabel()
 	{
-		switch (Output)
+		return name;
-		{
-		case MOD_VERSION:
-			return "AE2 Version";
-		case INTEGRATION:
-			return "AE2 Integration";
-		}
-
-		return "AE2_UNKNOWN";
 	}
 
 }