Skirda/SkirdaElectronLauncher
4
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Rebrand to Helios Launcher.

Browse Source
This commit is contained in:
Daniel Scalzi 2019-09-05 16:08:47 -04:00
parent 590cefc5d4
commit cbc8b07467
23 changed files with 51 additions and 3692 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
README.md
View File

@ -1,13 +1,15 @@
<p align="center"><img src="./app/assets/images/SealCircle.png" width="150px" height="150px" alt="aventium softworks"></p> <p align="center"><img src="./app/assets/images/SealCircle.png" width="150px" height="150px" alt="aventium softworks"></p>
<h1 align="center">Electron Launcher</h1> <h1 align="center">Helios Launcher</h1>
[<p align="center"><img src="https://img.shields.io/travis/dscalzi/ElectronLauncher.svg?style=for-the-badge" alt="travis">](https://travis-ci.org/dscalzi/ElectronLauncher) [<img src="https://img.shields.io/github/downloads/dscalzi/ElectronLauncher/total.svg?style=for-the-badge" alt="downloads">](https://github.com/dscalzi/ElectronLauncher/releases) <img src="https://forthebadge.com/images/badges/winter-is-coming.svg" height="28px" alt="stark"></p> <em><h5 align="center">(formerly Electron Launcher)</h5></em>
[<p align="center"><img src="https://img.shields.io/travis/dscalzi/HeliosLauncher.svg?style=for-the-badge" alt="travis">](https://travis-ci.org/dscalzi/HeliosLauncher) [<img src="https://img.shields.io/github/downloads/dscalzi/HeliosLauncher/total.svg?style=for-the-badge" alt="downloads">](https://github.com/dscalzi/HeliosLauncher/releases) <img src="https://forthebadge.com/images/badges/winter-is-coming.svg" height="28px" alt="stark"></p>
<p align="center">Join modded servers without worrying about installing Java, Forge, or other mods. We'll handle that for you.</p> <p align="center">Join modded servers without worrying about installing Java, Forge, or other mods. We'll handle that for you.</p>
![Screenshot 1](https://i.imgur.com/M8HVW9H.jpg) ![Screenshot 1](https://i.imgur.com/6o7SmH6.png)
![Screenshot 2](https://i.imgur.com/zDiSoq4.jpg) ![Screenshot 2](https://i.imgur.com/x3B34n1.png)
## Features ## Features
@ -36,24 +38,24 @@ This is not an exhaustive list. Download and install the launcher to gauge all i
## Downloads ## Downloads
You can download from [GitHub Releases](https://github.com/dscalzi/ElectronLauncher/releases) You can download from [GitHub Releases](https://github.com/dscalzi/HeliosLauncher/releases)
#### Latest Release #### Latest Release
[![](https://img.shields.io/github/release/dscalzi/ElectronLauncher.svg?style=flat-square)](https://github.com/dscalzi/ElectronLauncher/releases/latest) [![](https://img.shields.io/github/release/dscalzi/HeliosLauncher.svg?style=flat-square)](https://github.com/dscalzi/HeliosLauncher/releases/latest)
#### Latest Pre-Release #### Latest Pre-Release
[![](https://img.shields.io/github/release/dscalzi/ElectronLauncher/all.svg?style=flat-square)](https://github.com/dscalzi/ElectronLauncher/releases) [![](https://img.shields.io/github/release/dscalzi/HeliosLauncher/all.svg?style=flat-square)](https://github.com/dscalzi/HeliosLauncher/releases)
**Supported Platforms** **Supported Platforms**
If you download from the [Releases](https://github.com/dscalzi/ElectronLauncher/releases) tab, select the installer for your system. If you download from the [Releases](https://github.com/dscalzi/HeliosLauncher/releases) tab, select the installer for your system.
| Platform | File | | Platform | File |
| -------- | ---- | | -------- | ---- |
| Windows x64 | `electronlauncher-setup-VERSION.exe` | | Windows x64 | `helioslauncher-setup-VERSION.exe` |
| macOS | `electronlauncher-VERSION.dmg` | | macOS | `helioslauncher-VERSION.dmg` |
| Linux x64 | `electronlauncher-VERSION-x86_64.AppImage` | | Linux x64 | `helioslauncher-VERSION-x86_64.AppImage` |
## Console ## Console
@ -69,7 +71,7 @@ Ensure that you have the console tab selected. Do not paste anything into the co
If you want to export the console output, simply right click anywhere on the console and click **Save as..** If you want to export the console output, simply right click anywhere on the console and click **Save as..**
![console example](https://i.imgur.com/HazXrgT.png) ![console example](https://i.imgur.com/T5e73jP.png)
## Development ## Development
@ -85,8 +87,8 @@ If you want to export the console output, simply right click anywhere on the con
**Clone and Install Dependencies** **Clone and Install Dependencies**
```console ```console
> git clone https://github.com/dscalzi/ElectronLauncher.git > git clone https://github.com/dscalzi/HeliosLauncher.git
> cd ElectronLauncher > cd HeliosLauncher
> npm install > npm install
``` ```
@ -207,4 +209,4 @@ The best way to contact the developers is on Discord.
[rendererprocess]: https://electronjs.org/docs/tutorial/application-architecture#main-and-renderer-processes 'Renderer Process' [rendererprocess]: https://electronjs.org/docs/tutorial/application-architecture#main-and-renderer-processes 'Renderer Process'
[chromedebugger]: https://marketplace.visualstudio.com/items?itemName=msjsdiag.debugger-for-chrome 'Debugger for Chrome' [chromedebugger]: https://marketplace.visualstudio.com/items?itemName=msjsdiag.debugger-for-chrome 'Debugger for Chrome'
[discord]: https://discord.gg/zNWUXdt 'Discord' [discord]: https://discord.gg/zNWUXdt 'Discord'
[wiki]: https://github.com/dscalzi/ElectronLauncher/wiki 'wiki' [wiki]: https://github.com/dscalzi/HeliosLauncher/wiki 'wiki'

15
app/assets/css/launcher.css
View File

@ -105,16 +105,13 @@ body, button {
} }
/* Frame logo (windows only). */ /* Frame logo (windows only). */
#frameImageDock { #frameTitleDock {
width: 100px; padding: 0px 10px;
display: flex;
justify-content: center;
align-items: center;
position: relative;
} }
#frameImage { #frameTitleText {
height: 15px; font-size: 14px;
filter: grayscale(100%); font-family: 'Avenir Medium';
letter-spacing: 0.5px;
} }
/* Windows frame button dock. */ /* Windows frame button dock. */

BIN
app/assets/images/WCTextCream.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 16 KiB

BIN
app/assets/images/WCTextCrop.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 13 KiB

3636
app/assets/images/WesterosSealSquare.hqx
View File

File diff suppressed because it is too large Load Diff

BIN
app/assets/images/WesterosSealSquare.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 361 KiB

BIN
app/assets/images/WesterosSealSquare.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 188 KiB

BIN
app/assets/images/testserver.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 23 KiB

6
app/assets/js/processbuilder.js
View File

@ -298,7 +298,7 @@ class ProcessBuilder {
// Java Arguments // Java Arguments
if(process.platform === 'darwin'){ if(process.platform === 'darwin'){
args.push('-Xdock:name=ElectronLauncher') args.push('-Xdock:name=HeliosLauncher')
args.push('-Xdock:icon=' + path.join(__dirname, '..', 'images', 'minecraft.icns')) args.push('-Xdock:icon=' + path.join(__dirname, '..', 'images', 'minecraft.icns'))
} }
args.push('-Xmx' + ConfigManager.getMaxRAM()) args.push('-Xmx' + ConfigManager.getMaxRAM())
@ -336,7 +336,7 @@ class ProcessBuilder {
// Java Arguments // Java Arguments
if(process.platform === 'darwin'){ if(process.platform === 'darwin'){
args.push('-Xdock:name=ElectronLauncher') args.push('-Xdock:name=HeliosLauncher')
args.push('-Xdock:icon=' + path.join(__dirname, '..', 'images', 'minecraft.icns')) args.push('-Xdock:icon=' + path.join(__dirname, '..', 'images', 'minecraft.icns'))
} }
args.push('-Xmx' + ConfigManager.getMaxRAM()) args.push('-Xmx' + ConfigManager.getMaxRAM())
@ -438,7 +438,7 @@ class ProcessBuilder {
val = args[i].replace(argDiscovery, tempNativePath) val = args[i].replace(argDiscovery, tempNativePath)
break break
case 'launcher_name': case 'launcher_name':
val = args[i].replace(argDiscovery, 'Electron-Launcher') val = args[i].replace(argDiscovery, 'Helios-Launcher')
break break
case 'launcher_version': case 'launcher_version':
val = args[i].replace(argDiscovery, this.launcherVersion) val = args[i].replace(argDiscovery, this.launcherVersion)

6
app/assets/js/scripts/landing.js
View File

@ -338,7 +338,7 @@ function asyncSystemScan(mcVersion, launchAfter = true){
//$('#overlayDismiss').toggle(false) //$('#overlayDismiss').toggle(false)
setOverlayContent( setOverlayContent(
'Java is Required<br>to Launch', 'Java is Required<br>to Launch',
'A valid x64 installation of Java 8 is required to launch.<br><br>Please refer to our <a href="https://github.com/dscalzi/ElectronLauncher/wiki/Java-Management#manually-installing-a-valid-version-of-java">Java Management Guide</a> for instructions on how to manually install Java.', 'A valid x64 installation of Java 8 is required to launch.<br><br>Please refer to our <a href="https://github.com/dscalzi/HeliosLauncher/wiki/Java-Management#manually-installing-a-valid-version-of-java">Java Management Guide</a> for instructions on how to manually install Java.',
'I Understand', 'I Understand',
'Go Back' 'Go Back'
) )
@ -384,7 +384,7 @@ function asyncSystemScan(mcVersion, launchAfter = true){
// User will have to follow the guide to install Java. // User will have to follow the guide to install Java.
setOverlayContent( setOverlayContent(
'Unexpected Issue:<br>Java Download Failed', 'Unexpected Issue:<br>Java Download Failed',
'Unfortunately we\'ve encountered an issue while attempting to install Java. You will need to manually install a copy. Please check out our <a href="https://github.com/dscalzi/ElectronLauncher/wiki">Troubleshooting Guide</a> for more details and instructions.', 'Unfortunately we\'ve encountered an issue while attempting to install Java. You will need to manually install a copy. Please check out our <a href="https://github.com/dscalzi/HeliosLauncher/wiki">Troubleshooting Guide</a> for more details and instructions.',
'I Understand' 'I Understand'
) )
setOverlayHandler(() => { setOverlayHandler(() => {
@ -677,7 +677,7 @@ function dlAsync(login = true){
data = data.trim() data = data.trim()
if(data.indexOf('Could not find or load main class net.minecraft.launchwrapper.Launch') > -1){ if(data.indexOf('Could not find or load main class net.minecraft.launchwrapper.Launch') > -1){
loggerLaunchSuite.error('Game launch failed, LaunchWrapper was not downloaded properly.') loggerLaunchSuite.error('Game launch failed, LaunchWrapper was not downloaded properly.')
showLaunchFailure('Error During Launch', 'The main file, LaunchWrapper, failed to download properly. As a result, the game cannot launch.<br><br>To fix this issue, temporarily turn off your antivirus software and launch the game again.<br><br>If you have time, please <a href="https://github.com/dscalzi/ElectronLauncher/issues">submit an issue</a> and let us know what antivirus software you use. We\'ll contact them and try to straighten things out.') showLaunchFailure('Error During Launch', 'The main file, LaunchWrapper, failed to download properly. As a result, the game cannot launch.<br><br>To fix this issue, temporarily turn off your antivirus software and launch the game again.<br><br>If you have time, please <a href="https://github.com/dscalzi/HeliosLauncher/issues">submit an issue</a> and let us know what antivirus software you use. We\'ll contact them and try to straighten things out.')
} }
} }

2
app/assets/js/scripts/settings.js
View File

@ -1200,7 +1200,7 @@ function populateAboutVersionInformation(){
*/ */
function populateReleaseNotes(){ function populateReleaseNotes(){
$.ajax({ $.ajax({
url: 'https://github.com/dscalzi/ElectronLauncher/releases.atom', url: 'https://github.com/dscalzi/HeliosLauncher/releases.atom',
success: (data) => { success: (data) => {
const version = 'v' + remote.app.getVersion() const version = 'v' + remote.app.getVersion()
const entries = $(data).find('entry') const entries = $(data).find('entry')

2
app/assets/js/scripts/uicore.js
View File

@ -49,7 +49,7 @@ if(!isDev){
loggerAutoUpdaterSuccess.log('New update available', info.version) loggerAutoUpdaterSuccess.log('New update available', info.version)
if(process.platform === 'darwin'){ if(process.platform === 'darwin'){
info.darwindownload = `https://github.com/dscalzi/ElectronLauncher/releases/download/v${info.version}/electronlauncher-${info.version}.dmg` info.darwindownload = `https://github.com/dscalzi/HeliosLauncher/releases/download/v${info.version}/helioslauncher-${info.version}.dmg`
showUpdateUI(info) showUpdateUI(info)
} }

4
app/frame.ejs
View File

@ -12,8 +12,8 @@
</div> </div>
<% } else{ %> <% } else{ %>
<div id="frameContentWin"> <div id="frameContentWin">
<div id="frameImageDock"> <div id="frameTitleDock">
<img id= "frameImage" src="./assets/images/WCTextCrop.png" /> <span id="frameTitleText">Helios Launcher</span>
</div> </div>
<div id="frameButtonDockWin"> <div id="frameButtonDockWin">
<button class="frameButton fMb" id="frameButton_minimize" tabIndex="-1"> <button class="frameButton fMb" id="frameButton_minimize" tabIndex="-1">

2
app/landing.ejs
View File

@ -30,7 +30,7 @@
<div class="mediaDivider"></div> <div class="mediaDivider"></div>
<div id="externalMedia"> <div id="externalMedia">
<div class="mediaContainer"> <div class="mediaContainer">
<a href="https://github.com/dscalZi/ElectronLauncher" class="mediaURL" id="linkURL"> <a href="https://github.com/dscalZi/HeliosLauncher" class="mediaURL" id="linkURL">
<svg id="linkSVG" class="mediaSVG" viewBox="35.34 34.3575 70.68 68.71500"> <svg id="linkSVG" class="mediaSVG" viewBox="35.34 34.3575 70.68 68.71500">
<g> <g>
<path d="M75.37,65.51a3.85,3.85,0,0,0-1.73.42,8.22,8.22,0,0,1,.94,3.76A8.36,8.36,0,0,1,66.23,78H46.37a8.35,8.35,0,1,1,0-16.7h9.18a21.51,21.51,0,0,1,6.65-8.72H46.37a17.07,17.07,0,1,0,0,34.15H66.23A17,17,0,0,0,82.77,65.51Z"/> <path d="M75.37,65.51a3.85,3.85,0,0,0-1.73.42,8.22,8.22,0,0,1,.94,3.76A8.36,8.36,0,0,1,66.23,78H46.37a8.35,8.35,0,1,1,0-16.7h9.18a21.51,21.51,0,0,1,6.65-8.72H46.37a17.07,17.07,0,1,0,0,34.15H66.23A17,17,0,0,0,82.77,65.51Z"/>

2
app/login.ejs
View File

@ -57,7 +57,7 @@
<a href="https://minecraft.net/en-us/store/minecraft/">Need an Account?</a> <a href="https://minecraft.net/en-us/store/minecraft/">Need an Account?</a>
</span> </span>
<p class="loginDisclaimerText">Your password is sent directly to mojang and never stored.</p> <p class="loginDisclaimerText">Your password is sent directly to mojang and never stored.</p>
<p class="loginDisclaimerText">Electron Launcher is not affiliated with Mojang AB.</p> <p class="loginDisclaimerText">Helios Launcher is not affiliated with Mojang AB.</p>
</div> </div>
</form> </form>
</div> </div>

8
app/settings.ejs
View File

@ -278,7 +278,7 @@
<div id="settingsAboutCurrentContent"> <div id="settingsAboutCurrentContent">
<div id="settingsAboutCurrentHeadline"> <div id="settingsAboutCurrentHeadline">
<img id="settingsAboutLogo" src="./assets/images/SealCircle.png"> <img id="settingsAboutLogo" src="./assets/images/SealCircle.png">
<span id="settingsAboutTitle">Electron Launcher</span> <span id="settingsAboutTitle">Helios Launcher</span>
</div> </div>
<div id="settingsAboutCurrentVersion"> <div id="settingsAboutCurrentVersion">
<div id="settingsAboutCurrentVersionCheck">&#10003;</div> <div id="settingsAboutCurrentVersionCheck">&#10003;</div>
@ -292,10 +292,10 @@
</div> </div>
</div> </div>
<div id="settingsAboutButtons"> <div id="settingsAboutButtons">
<a href="https://github.com/dscalZi/ElectronLauncher" id="settingsAboutSourceButton" class="settingsAboutButton">Source (GitHub)</a> <a href="https://github.com/dscalZi/HeliosLauncher" id="settingsAboutSourceButton" class="settingsAboutButton">Source (GitHub)</a>
<!-- The following must be included in third-party usage. --> <!-- The following must be included in third-party usage. -->
<!-- <a href="https://github.com/dscalzi/ElectronLauncher" id="settingsAboutSourceButton" class="settingsAboutButton">Original Source</a> --> <!-- <a href="https://github.com/dscalzi/HeliosLauncher" id="settingsAboutSourceButton" class="settingsAboutButton">Original Source</a> -->
<a href="https://github.com/dscalZi/ElectronLauncher/issues" id="settingsAboutSupportButton" class="settingsAboutButton">Support</a> <a href="https://github.com/dscalZi/HeliosLauncher/issues" id="settingsAboutSupportButton" class="settingsAboutButton">Support</a>
<a href="#" id="settingsAboutDevToolsButton" class="settingsAboutButton">DevTools Console</a> <a href="#" id="settingsAboutDevToolsButton" class="settingsAboutButton">DevTools Console</a>
</div> </div>
</div> </div>

14
build.js
View File

@ -18,8 +18,8 @@ function getCurrentPlatform(){
builder.build({ builder.build({
targets: (process.argv[2] != null && Platform[process.argv[2]] != null ? Platform[process.argv[2]] : getCurrentPlatform()).createTarget(), targets: (process.argv[2] != null && Platform[process.argv[2]] != null ? Platform[process.argv[2]] : getCurrentPlatform()).createTarget(),
config: { config: {
appId: 'electronlauncher', appId: 'helioslauncher',
productName: 'Electron Launcher', productName: 'Helios Launcher',
artifactName: '${productName}.${ext}', artifactName: '${productName}.${ext}',
copyright: 'Copyright © 2018-2019 Daniel Scalzi', copyright: 'Copyright © 2018-2019 Daniel Scalzi',
directories: { directories: {
@ -32,21 +32,17 @@ builder.build({
target: 'nsis', target: 'nsis',
arch: 'x64' arch: 'x64'
} }
], ]
icon: 'build/icon.ico'
}, },
nsis: { nsis: {
oneClick: false, oneClick: false,
perMachine: true, perMachine: false,
allowElevation: true, allowElevation: true,
installerIcon: 'build/icon.ico',
uninstallerIcon: 'build/icon.ico',
allowToChangeInstallationDirectory: true allowToChangeInstallationDirectory: true
}, },
mac: { mac: {
target: 'dmg', target: 'dmg',
category: 'public.app-category.games', category: 'public.app-category.games'
icon: 'build/icon.icns'
}, },
linux: { linux: {
target: 'AppImage', target: 'AppImage',

BIN
build/icon.icns
View File

Binary file not shown.

BIN
build/icon.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 361 KiB

BIN
build/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 142 KiB

2
dev-app-update.yml
View File

@ -1,3 +1,3 @@
owner: dscalzi owner: dscalzi
repo: ElectronLauncher repo: HeliosLauncher
provider: github provider: github

2
package-lock.json generated
View File

@ -1,5 +1,5 @@
{ {
"name": "electronlauncher", "name": "helioslauncher",
"version": "1.6.0", "version": "1.6.0",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,

10
package.json
View File

@ -1,13 +1,13 @@
{ {
"name": "electronlauncher", "name": "helioslauncher",
"version": "1.6.0", "version": "1.6.0",
"productName": "Electron Launcher", "productName": "Helios Launcher",
"description": "Modded Minecraft Launcher", "description": "Modded Minecraft Launcher",
"author": "Daniel Scalzi (https://github.com/dscalzi/)", "author": "Daniel Scalzi (https://github.com/dscalzi/)",
"license": "UNLICENSED", "license": "UNLICENSED",
"homepage": "https://github.com/dscalzi/ElectronLauncher", "homepage": "https://github.com/dscalzi/HeliosLauncher",
"bugs": { "bugs": {
"url": "https://github.com/dscalzi/ElectronLauncher/issues" "url": "https://github.com/dscalzi/HeliosLauncher/issues"
}, },
"private": true, "private": true,
"main": "index.js", "main": "index.js",
@ -47,6 +47,6 @@
}, },
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git+https://github.com/dscalzi/ElectronLauncher.git" "url": "git+https://github.com/dscalzi/HeliosLauncher.git"
} }
} }