fixed simplelauncher for pre1.13

Author: FabiPunktExe

package.json

@@ -1,6 +1,6 @@
 {
   "name": "simplelauncher",
-  "version": "0.3.18",
+  "version": "0.3.19",
   "description": "Launcher for SimpleClient",
   "main": "src/main.js",
   "scripts": {
@@ -30,6 +30,7 @@
   "dependencies": {
     "app-root-path": "^3.1.0",
     "child_process": "^1.0.2",
+    "crypto": "^1.0.1",
     "electron-is-dev": "^2.0.0",
     "os": "^0.1.2",
     "path": "^0.12.7"

src/download/fabricdownloader.js

@@ -20,7 +20,9 @@ const downloadFabric = (version, meta, callback) => {
     const fabricDir = join(getMinecraftDir(), 'versions', fabric)
     if (existsSync(join(fabricDir, `${fabric}.json`))) downloadJar(version, meta, callback)
     else {
-        fetch('https://meta.fabricmc.net/v2/versions/installer').then(fabricInstallerResponse => {
+        var fabricInstallerUrl = 'https://meta.fabricmc.net/v2/versions/installer'
+        if (version.overrides.fabric_installer_url) fabricInstallerUrl = version.overrides.fabric_installer_url
+        fetch(fabricInstallerUrl).then(fabricInstallerResponse => {
             if (fabricInstallerResponse) {
                 fabricInstallerResponse.json().then(fabricInstallerJson => {
                     const fabricInstallerFile = join(getDirectory(), 'versions', version.id, `fabric-installer-${fabricInstallerJson[0].version}.jar`)

src/download/javadownloader.js

@@ -42,7 +42,6 @@ const downloadJava = (version, callback) => {
     getJavaDownloadsUrl(version, url => {
         if (url) {
             getJavaDownloads(url, downloads => {
-                console.log(downloads)
                 downloads = downloads.map(download => [download[1].downloads.raw.url, join(dir, download[0])])
                 downloadFilesAsync(downloads, undefined, log, callback)
             })

src/download/librarydownloader.js

@@ -1,13 +1,55 @@
 const { join } = require("path")
 const { downloadFilesAsync } = require("./downloader")
 const { getMinecraftDir } = require("../util")
+const { platform } = require("os")
+const { getJavaPath } = require("./javadownloader")
+const { spawn } = require("child_process")
+const { env, stdout, stderr } = require("process")
+const { existsSync, mkdirSync } = require("fs")
 
 const log = (...data) => console.log('[Library Download] ' + data)
 
-const downloadLibraries = (meta, callback) => {
+const collectLibraries = (meta, checkRule) => {
     const dir = join(getMinecraftDir(), 'libraries')
-    const libraries = meta.libraries.map(library => [library.downloads.artifact.url, join(dir, library.downloads.artifact.path)])
-    downloadFilesAsync(libraries, undefined, log, callback)
+    const allowedLibraries = meta.libraries.filter(library => library.rules ? library.rules.every(checkRule) : true)
+    const libraries = []
+    allowedLibraries.forEach(library => {
+        if (library.downloads.classifiers) {
+            const classifier = library.natives[platform() == 'win32' ? 'windows' : 'linux']
+            const download = library.downloads.classifiers[classifier]
+            libraries.push([download.url, join(dir, download.path)])
+        } else if (library.downloads.artifact) libraries.push([library.downloads.artifact.url, join(dir, library.downloads.artifact.path)])
+    })
+    return libraries
 }
 
-module.exports = {downloadLibraries}
+const collectNatives = (meta, checkRule) => {
+    const dir = join(getMinecraftDir(), 'libraries')
+    const allowedLibraries = meta.libraries.filter(library => library.rules ? library.rules.every(checkRule) : true)
+    const natives = []
+    allowedLibraries.forEach(library => {
+        if (library.downloads.classifiers) {
+            const classifier = library.natives[platform() == 'win32' ? 'windows' : 'linux']
+            const download = library.downloads.classifiers[classifier]
+            natives.push(join(dir, download.path))
+        }
+    })
+    return natives
+}
+
+const extractNatives = (meta, natives, nativesDirectory, separator, callback) => {
+    if (!existsSync(nativesDirectory)) mkdirSync(nativesDirectory, {recursive: true})
+    if (natives.length == 0) callback(true)
+    else {
+        const native = natives.shift()
+        spawn(join(getJavaPath(meta.javaVersion.component), 'bin', 'jar'), ['xf', native], {
+            cwd: nativesDirectory,
+            env: {PATH: env.PATH + separator + getJavaPath(meta.javaVersion.component)}
+        }).on('exit', status => {
+            if (status == 0) extractNatives(meta, natives, nativesDirectory, separator, callback)
+            else callback(false)
+        })
+    }
+}
+
+module.exports = {collectLibraries, collectNatives, extractNatives}

src/gui/index.html

@@ -42,6 +42,8 @@
                     document.getElementById('launch').innerText = 'Downloading Fabric Loader'
                 } else if (status == 'downloading_libraries') {
                     document.getElementById('launch').innerText = 'Downloading Libraries'
+                } else if (status == 'extracting_natives') {
+                    document.getElementById('launch').innerText = 'Extracting Natives'
                 } else if (status == 'downloading_assets') {
                     document.getElementById('launch').innerText = 'Downloading Assets'
                 } else if (status == 'downloading_mods') {