Update to 1.1.15 version

Kron4ek · Aug 15, 2021 · a727bca · a727bca
1 parent 7bd1610
commit a727bca
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+v1.1.15
+	* Fixed launching new Fabric versions.
+---------------------------------------------------------------------
 v1.1.14
 	* Fixed launching Forge with new client versions (1.17+). Hopefully, for sure this time.
 ---------------------------------------------------------------------

diff --git a/vlauncher_linux.pb b/vlauncher_linux.pb
@@ -42,7 +42,7 @@ Define.i useCustomJavaDefault = 0
 Define.i useCustomParamsDefault = 0
 Define.i keepLauncherOpenDefault = 0
 
-Define.s launcherVersion = "1.1.14"
+Define.s launcherVersion = "1.1.15"
 Define.s launcherDeveloper = "Kron4ek"
 
 Declare assetsToResources(assetsIndex.s)
@@ -115,6 +115,7 @@ If OpenWindow(0, #PB_Ignore, #PB_Ignore, windowWidth, windowHeight, "Vortex Mine
           downloadMissingLibraries = ReadPreferenceInteger("DownloadMissingLibs", downloadMissingLibrariesDefault)
           librariesString = ""
           clientArguments = ""
+          jvmArguments = ""
 
           If FindString(clientVersion, " ")
             clientVersion = removeSpacesFromVersionName(clientVersion)
@@ -197,7 +198,7 @@ If OpenWindow(0, #PB_Ignore, #PB_Ignore, windowWidth, windowHeight, "Vortex Mine
                       jsonArrayElement = GetJSONElement(jsonJvmArray, i)
 
                       If JSONType(jsonArrayElement) = #PB_JSON_String
-                        jvmArguments + " " + GetJSONString(jsonArrayElement) + " "
+                        jvmArguments + " " + Chr(34) + GetJSONString(jsonArrayElement) + Chr(34) + " "
                       EndIf
                     Next
                   EndIf
@@ -229,7 +230,7 @@ If OpenWindow(0, #PB_Ignore, #PB_Ignore, windowWidth, windowHeight, "Vortex Mine
                           jsonArrayElement = GetJSONElement(jsonJvmArray, i)
 
                           If JSONType(jsonArrayElement) = #PB_JSON_String
-                            jvmArguments + " " + GetJSONString(jsonArrayElement) + " "
+                            jvmArguments + " " + Chr(34) + GetJSONString(jsonArrayElement) + Chr(34) + " "
                           EndIf
                         Next
                       EndIf
@@ -307,8 +308,8 @@ If OpenWindow(0, #PB_Ignore, #PB_Ignore, windowWidth, windowHeight, "Vortex Mine
                   fullLaunchString = ReplaceString(fullLaunchString, "${library_directory}", "libraries")
                   fullLaunchString = ReplaceString(fullLaunchString, "${classpath_separator}", ":")
                   fullLaunchString = ReplaceString(fullLaunchString, "${natives_directory}", nativesPath)
-                  fullLaunchString = ReplaceString(fullLaunchString, "-Dminecraft.launcher.brand=${launcher_name}", "")
-                  fullLaunchString = ReplaceString(fullLaunchString, "-Dminecraft.launcher.version=${launcher_version}", "")
+                  fullLaunchString = ReplaceString(fullLaunchString, Chr(34) + "-Dminecraft.launcher.brand=${launcher_name}" + Chr(34), "")
+                  fullLaunchString = ReplaceString(fullLaunchString, Chr(34) + "-Dminecraft.launcher.version=${launcher_version}" + Chr(34), "")
 
                   RunProgram(javaBinaryPath, fullLaunchString, workingDirectory)
 

diff --git a/vlauncher_windows.pb b/vlauncher_windows.pb
@@ -45,7 +45,7 @@ Define.i keepLauncherOpenDefault = 0
 Global.i useCustomJavaDefault = 0
 Global.s javaBinaryPathDefault = "C:\jre8\bin\javaw.exe"
 
-Define.s launcherVersion = "1.1.14"
+Define.s launcherVersion = "1.1.15"
 Define.s launcherDeveloper = "Kron4ek"
 
 Declare assetsToResources(assetsIndex.s)
@@ -124,6 +124,7 @@ If OpenWindow(0, #PB_Ignore, #PB_Ignore, windowWidth, windowHeight, "Vortex Mine
           downloadMissingLibraries = ReadPreferenceInteger("DownloadMissingLibs", downloadMissingLibrariesDefault)
           librariesString = ""
           clientArguments = ""
+          jvmArguments = ""
 
           If FindString(clientVersion, " ")
             clientVersion = removeSpacesFromVersionName(clientVersion)
@@ -210,7 +211,7 @@ If OpenWindow(0, #PB_Ignore, #PB_Ignore, windowWidth, windowHeight, "Vortex Mine
                       jsonArrayElement = GetJSONElement(jsonJvmArray, i)
 
                       If JSONType(jsonArrayElement) = #PB_JSON_String
-                        jvmArguments + " " + GetJSONString(jsonArrayElement) + " "
+                        jvmArguments + " " + Chr(34) + GetJSONString(jsonArrayElement) + Chr(34) + " "
                       EndIf
                     Next
                   EndIf
@@ -242,7 +243,7 @@ If OpenWindow(0, #PB_Ignore, #PB_Ignore, windowWidth, windowHeight, "Vortex Mine
                           jsonArrayElement = GetJSONElement(jsonJvmArray, i)
 
                           If JSONType(jsonArrayElement) = #PB_JSON_String
-                            jvmArguments + " " + GetJSONString(jsonArrayElement) + " "
+                            jvmArguments + " " + Chr(34) + GetJSONString(jsonArrayElement) + Chr(34) + " "
                           EndIf
                         Next
                       EndIf
@@ -320,8 +321,8 @@ If OpenWindow(0, #PB_Ignore, #PB_Ignore, windowWidth, windowHeight, "Vortex Mine
                   fullLaunchString = ReplaceString(fullLaunchString, "${library_directory}", "libraries")
                   fullLaunchString = ReplaceString(fullLaunchString, "${classpath_separator}", ";")
                   fullLaunchString = ReplaceString(fullLaunchString, "${natives_directory}", nativesPath)
-                  fullLaunchString = ReplaceString(fullLaunchString, "-Dminecraft.launcher.brand=${launcher_name}", "")
-                  fullLaunchString = ReplaceString(fullLaunchString, "-Dminecraft.launcher.version=${launcher_version}", "")
+                  fullLaunchString = ReplaceString(fullLaunchString, Chr(34) + "-Dminecraft.launcher.brand=${launcher_name}" + Chr(34), "")
+                  fullLaunchString = ReplaceString(fullLaunchString, Chr(34) + "-Dminecraft.launcher.version=${launcher_version}" + Chr(34), "")
 
                   RunProgram(javaBinaryPath, fullLaunchString, workingDirectory)