فهرست منبع

previous commit fix

Veloe 2 سال پیش
والد
کامیت
5e2a2de5ef
2فایلهای تغییر یافته به همراه6 افزوده شده و 17 حذف شده
  1. 4 15
      VeloeMinecraftLauncher/Utils/StartCommandBuilder.cs
  2. 2 2
      VeloeMinecraftLauncher/ViewModels/SettingsWindowViewModel.cs

+ 4 - 15
VeloeMinecraftLauncher/Utils/StartCommandBuilder.cs

@@ -145,18 +145,10 @@ internal static class StartCommandBuilder
             if (version.Arguments.Jvm is not null)
             if (version.Arguments.Jvm is not null)
                 foreach (var argument in version.Arguments.Jvm)
                 foreach (var argument in version.Arguments.Jvm)
                 {
                 {
-                    if (argument is null)
-                        continue;
-
-                    var type = argument.GetType();
-
-                    if (argument is not JsonElement)
-                        continue;
-
-                    if (!(((JsonElement)argument).ValueKind == JsonValueKind.String))
-                        continue;
-
-                    if (((JsonElement)argument).Deserialize(typeof(string)) is not string value) continue;
+                    if (argument is null ||
+                        argument is not JsonElement jsonArgument ||
+                        jsonArgument.ValueKind != JsonValueKind.String ||
+                        jsonArgument.Deserialize(typeof(string)) is not string value) continue;
 
 
                     //for new forge versions (1.18, 1.19)
                     //for new forge versions (1.18, 1.19)
                     if (value.Contains("${version_name}"))
                     if (value.Contains("${version_name}"))
@@ -345,11 +337,8 @@ internal static class StartCommandBuilder
                 //for new forge
                 //for new forge
                 default:
                 default:
                     if (argsValues[i] is not null && !argsValues[i].Contains("${"))
                     if (argsValues[i] is not null && !argsValues[i].Contains("${"))
-                    {
                         returnString.Append($" {args[i]} {argsValues[i]}");
                         returnString.Append($" {args[i]} {argsValues[i]}");
-                    }
                     break;
                     break;
-
             }
             }
         }
         }
         return returnString.ToString();
         return returnString.ToString();

+ 2 - 2
VeloeMinecraftLauncher/ViewModels/SettingsWindowViewModel.cs

@@ -184,7 +184,7 @@ public class SettingsWindowViewModel : ViewModelBase
             var storageProvider = ((Window)window).StorageProvider;
             var storageProvider = ((Window)window).StorageProvider;
             var initPath = String.Empty;
             var initPath = String.Empty;
 
 
-            if (string.IsNullOrEmpty(Settings.minecraftForlderPath))
+            if (!string.IsNullOrEmpty(Settings.minecraftForlderPath))
                 initPath = Path.GetFullPath(Settings.minecraftForlderPath);
                 initPath = Path.GetFullPath(Settings.minecraftForlderPath);
 
 
             var folderPickerOpenOptions = new FolderPickerOpenOptions() 
             var folderPickerOpenOptions = new FolderPickerOpenOptions() 
@@ -209,7 +209,7 @@ public class SettingsWindowViewModel : ViewModelBase
             var storageProvider = ((Window)window).StorageProvider;
             var storageProvider = ((Window)window).StorageProvider;
             var initPath = String.Empty;
             var initPath = String.Empty;
 
 
-            if (string.IsNullOrEmpty(Settings.javaPath))
+            if (!string.IsNullOrEmpty(Settings.javaPath))
                 initPath = Path.GetFullPath(Settings.javaPath);
                 initPath = Path.GetFullPath(Settings.javaPath);
 
 
             var folderPickerOpenOptions = new FolderPickerOpenOptions()
             var folderPickerOpenOptions = new FolderPickerOpenOptions()