fixed garbarge collector choise

src/app/launcher/forge1.12.2/getArgs.cpp

@@ -91,7 +91,48 @@ QStringList getArgs::getCrossPlatformArgs(QString &RAM, QString &username, QStri
 		<< "-Dminecraft.applet.TargetDirectory=./"
 		<< "-DlibraryDirectory=./libraries"
 		<< "-Dlog4j.configurationFile=./assets/log_configs/client-1.12.xml"
+		// Garbarge Collector общие настройки
+		<< "-XX:+UnlockDiagnosticVMOptions"
+		<< "-XX:+DisableExplicitGC"
+		<< "-XX:ReservedCodeCacheSize=400M"
+		<< "-XX:+AlwaysPreTouch"
+		<< "-XX:+UseNUMA"
+		//<< "-XX:+UseFastUnorderedTimeStamps" // Не работает
+		<< "-server" // На счёт него не уверен
+		<< "-XX:+PerfDisableSharedMem"
+		<< "-XX:AllocatePrefetchStyle=3";
 
+		
+		
+	
+	// Garbarge Collector
+	if (garbarge_collector == "CMS (Concurrent Mark-Sweep)") {
+		// CMS (Concurrent Mark-Sweep)
+		arguments
+			<< "-XX:+UseConcMarkSweepGC" 
+			<< "-XX:CMSInitiatingOccupancyFraction=75" 
+			<< "-XX:+UseCMSInitiatingOccupancyOnly"
+			<< "-XX:CMSWaitDuration=1000" 
+			<< "-XX:+CMSConcurrentMTEnabled";
+	}
+	else if (garbarge_collector == "G1GC (Garbage First Garbage Collector)") {
+		// G1GC (Garbage First Garbage Collector)
+		arguments
+			<< "-XX:+UseG1GC"
+			<< "-XX:G1NewSizePercent=20"
+			<< "-XX:G1ReservePercent=20"
+			<< "-XX:MaxGCPauseMillis=50"
+			<< "-XX:G1HeapRegionSize=32M";
+	}
+	else if (garbarge_collector == "Azul's Continuously Concurrent Compacting Collector (C4)") {
+		// C4 - Не поддерживается java8
+		arguments
+			<< "-XX:+UseC4GC" 
+			<< "-XX:MaxHeapSize=2G" 
+			<< "-XX:InitialHeapSize=1G";
+	}
+
+	arguments
 		<< "net.minecraft.launchwrapper.Launch"
 		<< "--username" << username
 		<< "--version" << "Forge_1.12.2"
@@ -105,42 +146,10 @@ QStringList getArgs::getCrossPlatformArgs(QString &RAM, QString &username, QStri
 
 		<< "--versionType" << "Forge"
 		<< "--height" << "480"
-		<< "--width" << "854"
-		
-		// Garbarge Collector общие настройки
-		<< "-XX:+UnlockDiagnosticVMOptions"
-		<< "-XX:+DisableExplicitGC"
-		<< "-XX:ReservedCodeCacheSize=400M"
-		<< "-XX:+AlwaysPreTouch"
-		<< "-XX:+UseNUMA"
-		//<< "-XX:+UseFastUnorderedTimeStamps" // Не работает
-		//<< "-server"
-		<< "-XX:+PerfDisableSharedMem"
-		<< "-XX:AllocatePrefetchStyle=3";
+		<< "--width" << "854";
 		
 
 
-		// Garbarge Collector
-		// CMS (Concurrent Mark-Sweep)
-		arguments
-		<< "-XX:+UseConcMarkSweepGC" 
-		<< "-XX:CMSInitiatingOccupancyFraction=75" 
-		<< "-XX:+UseCMSInitiatingOccupancyOnly"
-		<< "-XX:CMSWaitDuration=1000" 
-		<< "-XX:+CMSConcurrentMTEnabled";
-		
-		// G1GC (Garbage First Garbage Collector)
-		/*
-        << "-XX:+UseG1GC"
-        << "-XX:G1NewSizePercent=20"
-        << "-XX:G1ReservePercent=20"
-        << "-XX:MaxGCPauseMillis=50"
-        << "-XX:G1HeapRegionSize=32M"
-		*/
-		// C4 - Не поддерживается java8
-		//<< "-XX:+UseC4GC" 
-		//<< "-XX:MaxHeapSize=2G" 
-		//<< "-XX:InitialHeapSize=1G"
-
+	qDebug() << arguments;
 	return arguments;
 }

src/resources/mainwindow.ui

@@ -735,6 +735,7 @@ QComboBox::drop-down {
 
 
 QComboBox:hover {
+	color: rgba(255, 255, 255,0.65);
 	border: 2px solid rgb(86, 88, 90);
 	border-top: 0px solid rgba(255, 255, 255, 0.68);
 }</string>