Merge branch 'master' of https://github.com/dscalzi/HeliosLauncher into master

.nvmrc

@@ -1 +1 @@
-12
+14

.travis.yml

@@ -1,9 +1,9 @@
 matrix:
   include:
     - os: osx
-      osx_image: xcode11.3
+      osx_image: xcode12.2
       language: node_js
-      node_js: "12"
+      node_js: "14"
       env:
         - ELECTRON_CACHE=$HOME/.cache/electron
         - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
@@ -13,7 +13,7 @@ matrix:
     - os: linux
       services: docker
       language: generic
-      node_js: "12"
+      node_js: "14"
       env:
         - ELECTRON_BUILDER_ALLOW_UNRESOLVED_DEPENDENCIES=true
 

README.md

@@ -76,11 +76,13 @@ If you want to export the console output, simply right click anywhere on the con
 
 ## Development
 
+This section details the setup of a basic developmentment environment.
+
 ### Getting Started
 
 **System Requirements**
 
-* [Node.js][nodejs] v12
+* [Node.js][nodejs] v14
 
 ---
 

app/assets/js/configmanager.js

@@ -9,7 +9,7 @@ const sysRoot = process.env.APPDATA || (process.platform == 'darwin' ? process.e
 const dataPath = path.join(sysRoot, '.ardacraftlauncher')
 
 // Forked processes do not have access to electron, so we have this workaround.
-const launcherDir = process.env.CONFIG_DIRECT_PATH || require('electron').remote.app.getPath('userData')
+const launcherDir = process.env.CONFIG_DIRECT_PATH || require('@electron/remote').app.getPath('userData')
 
 /**
  * Retrieve the absolute path of the launcher directory.

app/assets/js/mojang.js

@@ -17,7 +17,7 @@ const minecraftAgent = {
 const authpath = 'https://authserver.mojang.com'
 const statuses = [
     {
-        service: 'sessionserver.mojang.com',
+        service: 'session.minecraft.net',
         status: 'grey',
         name: 'Multiplayer Session Service',
         essential: true

app/assets/js/scripts/landing.js

@@ -173,11 +173,6 @@ const refreshMojangStatuses = async function(){
         for(let i=0; i<statuses.length; i++){
             const service = statuses[i]
 
-            // Mojang API is broken for sessionserver. https://bugs.mojang.com/browse/WEB-2303
-            if(service.service === 'sessionserver.mojang.com') {
-                service.status = 'green'
-            }
-
             if(service.essential){
                 tooltipEssentialHTML += `<div class="mojangStatusContainer">
                     <span class="mojangStatusIcon" style="color: ${Mojang.statusToHex(service.status)};">&#8226;</span>

app/assets/js/scripts/uicore.js

@@ -5,10 +5,11 @@
  * modules, excluding dependencies.
  */
 // Requirements
-const $                                      = require('jquery')
+const $                              = require('jquery')
-const {ipcRenderer, remote, shell, webFrame} = require('electron')
+const {ipcRenderer, shell, webFrame} = require('electron')
-const isDev                                  = require('./assets/js/isdev')
+const remote                         = require('@electron/remote')
-const LoggerUtil                             = require('./assets/js/loggerutil')
+const isDev                          = require('./assets/js/isdev')
+const LoggerUtil                     = require('./assets/js/loggerutil')
 
 const loggerUICore             = LoggerUtil('%c[UICore]', 'color: #000668; font-weight: bold')
 const loggerAutoUpdater        = LoggerUtil('%c[AutoUpdater]', 'color: #000668; font-weight: bold')

index.js

@@ -1,3 +1,5 @@
+require('@electron/remote/main').initialize()
+
 // Requirements
 const { app, BrowserWindow, ipcMain, Menu } = require('electron')
 const autoUpdater = require('electron-updater').autoUpdater

package.json

@@ -22,18 +22,19 @@
     "lint": "eslint --config .eslintrc.json ."
   },
   "engines": {
-    "node": "12.x.x"
+    "node": "14.x.x"
   },
   "dependencies": {
-    "adm-zip": "^0.5.1",
+    "@electron/remote": "^1.0.4",
+    "adm-zip": "^0.5.3",
     "async": "^3.2.0",
-    "discord-rpc": "^3.1.4",
+    "discord-rpc": "^3.2.0",
-    "ejs": "^3.1.5",
+    "ejs": "^3.1.6",
     "ejs-electron": "^2.1.1",
-    "electron-updater": "^4.3.5",
+    "electron-updater": "^4.3.8",
-    "fs-extra": "^9.0.1",
+    "fs-extra": "^9.1.0",
     "github-syntax-dark": "^0.5.0",
-    "jquery": "^3.5.1",
+    "jquery": "^3.6.0",
     "request": "^2.88.2",
     "semver": "^7.3.4",
     "tar-fs": "^2.1.1",
@@ -41,9 +42,9 @@
   },
   "devDependencies": {
     "cross-env": "^7.0.3",
-    "electron": "^11.0.5",
+    "electron": "^12.0.0",
-    "electron-builder": "^22.9.1",
+    "electron-builder": "^22.10.5",
-    "eslint": "^7.15.0"
+    "eslint": "^7.21.0"
   },
   "repository": {
     "type": "git",