Update to 1.1.18

Kron4ek · May 25, 2022 · 3522db0 · 3522db0
1 parent 8aa51bc
commit 3522db0
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 13 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+v1.1.18
+	* Fixed launching Minecraft clients that use new LWJGL (3.3+)
+---------------------------------------------------------------------
 v1.1.17
 	* Fixed a critical security vulnerability related to Log4j (CVE-2021-44228). Properly this time.
 ---------------------------------------------------------------------

diff --git a/vlauncher_linux.pb b/vlauncher_linux.pb
@@ -1,6 +1,6 @@
 EnableExplicit
 
-Define.s workingDirectory = GetPathPart(ProgramFilename())
+Define.s workingDirectory = RTrim(GetPathPart(ProgramFilename()), "/")
 Global.s tempDirectory = GetTemporaryDirectory()
 
 Global.i downloadOkButton
@@ -42,7 +42,7 @@ Define.i useCustomJavaDefault = 0
 Define.i useCustomParamsDefault = 0
 Define.i keepLauncherOpenDefault = 0
 
-Define.s launcherVersion = "1.1.17"
+Define.s launcherVersion = "1.1.18"
 Define.s launcherDeveloper = "Kron4ek"
 
 Declare assetsToResources(assetsIndex.s)
@@ -315,7 +315,7 @@ If OpenWindow(0, #PB_Ignore, #PB_Ignore, windowWidth, windowHeight, "Vortex Mine
 
                   fullLaunchString = ReplaceString(fullLaunchString, "${auth_player_name}", playerName)
                   fullLaunchString = ReplaceString(fullLaunchString, "${version_name}", clientVersion)
-                  fullLaunchString = ReplaceString(fullLaunchString, "${game_directory}", ".")
+                  fullLaunchString = ReplaceString(fullLaunchString, "${game_directory}", Chr(34) + workingDirectory + Chr(34))
                   fullLaunchString = ReplaceString(fullLaunchString, "${assets_root}", "assets")
                   fullLaunchString = ReplaceString(fullLaunchString, "${auth_uuid}", uuid)
                   fullLaunchString = ReplaceString(fullLaunchString, "${auth_access_token}", "00000000000000000000000000000000")
@@ -687,7 +687,7 @@ Procedure.s parseLibraries(clientVersion.s, prepareForDownload.i = 0)
 
   Protected.s libName, libsString, packFileName, url
   Protected.s jsonRulesOsName
-  Protected Dim libSplit.s(3)
+  Protected Dim libSplit.s(4)
 
   If prepareForDownload = 1
     downloadListFile = OpenFile(#PB_Any, tempDirectory + "vlauncher_download_list.txt")
@@ -731,12 +731,17 @@ Procedure.s parseLibraries(clientVersion.s, prepareForDownload.i = 0)
       If allowLib
         libName = GetJSONString(GetJSONMember(jsonArrayElement, "name"))
 
-        For k = 1 To 3
+        libSplit(4) = ""
+        For k = 1 To 4
           libSplit(k) = StringField(libName, k, ":")
         Next
 
         libName = ReplaceString(libSplit(1), ".", "/") + "/" + libSplit(2) + "/" + libSplit(3) + "/" + libSplit(2) + "-" + libSplit(3)
 
+        If libSplit(4)
+          libName + "-" + libSplit(4)
+        EndIf
+
         If prepareForDownload = 1
           jsonDownloadsMember = GetJSONMember(jsonArrayElement, "downloads")
 

diff --git a/vlauncher_macos.pb b/vlauncher_macos.pb
@@ -42,7 +42,7 @@ Define.i useCustomJavaDefault = 0
 Define.i useCustomParamsDefault = 0
 Define.i keepLauncherOpenDefault = 0
 
-Define.s launcherVersion = "1.1.17"
+Define.s launcherVersion = "1.1.18"
 Define.s launcherDeveloper = "Kron4ek"
 
 Declare assetsToResources(assetsIndex.s)
@@ -696,7 +696,7 @@ Procedure.s parseLibraries(clientVersion.s, prepareForDownload.i = 0)
 
   Protected.s libName, libsString, packFileName, url
   Protected.s jsonRulesOsName
-  Protected Dim libSplit.s(3)
+  Protected Dim libSplit.s(4)
 
   If prepareForDownload = 1
     downloadListFile = OpenFile(#PB_Any, tempDirectory + "vlauncher_download_list.txt")
@@ -740,12 +740,17 @@ Procedure.s parseLibraries(clientVersion.s, prepareForDownload.i = 0)
       If allowLib
         libName = GetJSONString(GetJSONMember(jsonArrayElement, "name"))
 
-        For k = 1 To 3
+        libSplit(4) = ""
+        For k = 1 To 4
           libSplit(k) = StringField(libName, k, ":")
         Next
 
         libName = ReplaceString(libSplit(1), ".", "/") + "/" + libSplit(2) + "/" + libSplit(3) + "/" + libSplit(2) + "-" + libSplit(3)
 
+        If libSplit(4)
+          libName + "-" + libSplit(4)
+        EndIf
+
         If prepareForDownload = 1
           jsonDownloadsMember = GetJSONMember(jsonArrayElement, "downloads")
 

diff --git a/vlauncher_windows.pb b/vlauncher_windows.pb
@@ -1,6 +1,6 @@
 EnableExplicit
 
-Define.s workingDirectory = GetPathPart(ProgramFilename())
+Define.s workingDirectory = RTrim(GetPathPart(ProgramFilename()), "\")
 Global.s tempDirectory = GetTemporaryDirectory()
 
 Global Dim programFilesDir.s(1)
@@ -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.17"
+Define.s launcherVersion = "1.1.18"
 Define.s launcherDeveloper = "Kron4ek"
 
 Declare assetsToResources(assetsIndex.s)
@@ -328,7 +328,7 @@ If OpenWindow(0, #PB_Ignore, #PB_Ignore, windowWidth, windowHeight, "Vortex Mine
 
                   fullLaunchString = ReplaceString(fullLaunchString, "${auth_player_name}", playerName)
                   fullLaunchString = ReplaceString(fullLaunchString, "${version_name}", clientVersion)
-                  fullLaunchString = ReplaceString(fullLaunchString, "${game_directory}", ".")
+                  fullLaunchString = ReplaceString(fullLaunchString, "${game_directory}", Chr(34) + workingDirectory + Chr(34))
                   fullLaunchString = ReplaceString(fullLaunchString, "${assets_root}", "assets")
                   fullLaunchString = ReplaceString(fullLaunchString, "${auth_uuid}", uuid)
                   fullLaunchString = ReplaceString(fullLaunchString, "${auth_access_token}", "00000000000000000000000000000000")
@@ -701,7 +701,7 @@ Procedure.s parseLibraries(clientVersion.s, prepareForDownload.i = 0)
 
   Protected.s libName, libsString, packFileName, url
   Protected.s jsonRulesOsName
-  Protected Dim libSplit.s(3)
+  Protected Dim libSplit.s(4)
 
   If prepareForDownload = 1
     downloadListFile = OpenFile(#PB_Any, tempDirectory + "vlauncher_download_list.txt")
@@ -745,12 +745,17 @@ Procedure.s parseLibraries(clientVersion.s, prepareForDownload.i = 0)
       If allowLib
         libName = GetJSONString(GetJSONMember(jsonArrayElement, "name"))
 
-        For k = 1 To 3
+        libSplit(4) = ""
+        For k = 1 To 4
           libSplit(k) = StringField(libName, k, ":")
         Next
 
         libName = ReplaceString(libSplit(1), ".", "\") + "\" + libSplit(2) + "\" + libSplit(3) + "\" + libSplit(2) + "-" + libSplit(3)
 
+        If libSplit(4)
+          libName + "-" + libSplit(4)
+        EndIf
+
         If prepareForDownload = 1
           jsonDownloadsMember = GetJSONMember(jsonArrayElement, "downloads")