diff --git a/README.md b/README.md index dd71983..2bcd42d 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -

westeroscraft

+

aventium softworks

-

WesterosCraft Launcher

+

Electron Launcher

-[

travis](https://travis-ci.org/WesterosCraftCode/ElectronLauncher) [downloads](https://github.com/WesterosCraftCode/ElectronLauncher/releases) stark

+[

travis](https://travis-ci.org/WesterosCraftCode/ElectronLauncher) [downloads](https://github.com/WesterosCraftCode/ElectronLauncher/releases) stark

-

Join WesterosCraft without worrying about installing Java, Forge, or other mods. We'll handle that for you.

+

Join modded servers without worrying about installing Java, Forge, or other mods. We'll handle that for you.

![Screenshot 1](https://i.imgur.com/M8HVW9H.jpg) ![Screenshot 2](https://i.imgur.com/zDiSoq4.jpg) @@ -36,24 +36,24 @@ This is not an exhaustive list. Download and install the launcher to gauge all i ## Downloads -You can download from [GitHub Releases](https://github.com/WesterosCraftCode/ElectronLauncher/releases) or [WesterosCraft.com/launcher](https://westeroscraft.com/launcher) +You can download from [GitHub Releases](https://github.com/WesterosCraftCode/ElectronLauncher/releases) #### Latest Release -[![](https://img.shields.io/github/release/WesterosCraftCode/ElectronLauncher.svg?style=flat-square)](https://github.com/WesterosCraftCode/ElectronLauncher/releases/latest) +[![](https://img.shields.io/github/release/dscalzi/ElectronLauncher.svg?style=flat-square)](https://github.com/dscalzi/ElectronLauncher/releases/latest) #### Latest Pre-Release -[![](https://img.shields.io/github/release/WesterosCraftCode/ElectronLauncher/all.svg?style=flat-square)](https://github.com/WesterosCraftCode/ElectronLauncher/releases) +[![](https://img.shields.io/github/release/dscalzi/ElectronLauncher/all.svg?style=flat-square)](https://github.com/dscalzi/ElectronLauncher/releases) **Supported Platforms** -If you download from the [Releases](https://github.com/WesterosCraftCode/ElectronLauncher/releases) tab, select the installer for your system. +If you download from the [Releases](https://github.com/dscalzi/ElectronLauncher/releases) tab, select the installer for your system. | Platform | File | | -------- | ---- | -| Windows x64 | `westeroscraftlauncher-setup-VERSION.exe` | -| macOS | `westeroscraftlauncher-VERSION.dmg` | -| Linux x64 | `westeroscraftlauncher-VERSION-x86_64.AppImage` | +| Windows x64 | `electronlauncher-setup-VERSION.exe` | +| macOS | `electronlauncher-VERSION.dmg` | +| Linux x64 | `electronlauncher-VERSION-x86_64.AppImage` | ## Console @@ -85,7 +85,7 @@ If you want to export the console output, simply right click anywhere on the con **Clone and Install Dependencies** ```console -> git clone https://github.com/WesterosCraftCode/ElectronLauncher.git +> git clone https://github.com/dscalzi/ElectronLauncher.git > cd ElectronLauncher > npm install ``` @@ -190,13 +190,11 @@ We reserve the right to update these conditions at any time, please check back p ## Resources -* [WesterosCraft][westeroscraft] -* [Support Forum][supportforum] * [Wiki][wiki] The best way to contact the developers is on Discord. -[![discord](https://discordapp.com/api/guilds/98469309352775680/embed.png?style=banner2)][discord] +[![discord](https://discordapp.com/api/guilds/211524927831015424/embed.png?style=banner3)][discord] --- @@ -208,7 +206,5 @@ The best way to contact the developers is on Discord. [mainprocess]: https://electronjs.org/docs/tutorial/application-architecture#main-and-renderer-processes 'Main 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' -[westeroscraft]: https://westeroscraft.com/ 'WesterosCraft.com' -[supportforum]: https://westeroscraft.com/forum/support.40/ 'Support Forum' -[discord]: https://discord.gg/hqdjs3m 'Discord' -[wiki]: https://github.com/WesterosCraftCode/ElectronLauncher/wiki 'wiki' +[discord]: https://discord.gg/zNWUXdt 'Discord' +[wiki]: https://github.com/dscalzi/ElectronLauncher/wiki 'wiki' diff --git a/app/assets/images/SealCircle.png b/app/assets/images/SealCircle.png new file mode 100644 index 0000000..9e21d08 Binary files /dev/null and b/app/assets/images/SealCircle.png differ diff --git a/app/assets/images/WesterosSealCircle.png b/app/assets/images/WesterosSealCircle.png deleted file mode 100644 index 8200a7a..0000000 Binary files a/app/assets/images/WesterosSealCircle.png and /dev/null differ diff --git a/app/assets/js/configmanager.js b/app/assets/js/configmanager.js index 50242a9..f34cc25 100644 --- a/app/assets/js/configmanager.js +++ b/app/assets/js/configmanager.js @@ -5,6 +5,7 @@ const path = require('path') const logger = require('./loggerutil')('%c[ConfigManager]', 'color: #a02d2a; font-weight: bold') const sysRoot = process.env.APPDATA || (process.platform == 'darwin' ? process.env.HOME + '/Library/Application Support' : process.env.HOME) +// TODO change const dataPath = path.join(sysRoot, '.westeroscraft') // Forked processes do not have access to electron, so we have this workaround. diff --git a/app/assets/js/processbuilder.js b/app/assets/js/processbuilder.js index 316b839..49c5009 100644 --- a/app/assets/js/processbuilder.js +++ b/app/assets/js/processbuilder.js @@ -298,7 +298,7 @@ class ProcessBuilder { // Java Arguments if(process.platform === 'darwin'){ - args.push('-Xdock:name=WesterosCraft') + args.push('-Xdock:name=ElectronLauncher') args.push('-Xdock:icon=' + path.join(__dirname, '..', 'images', 'minecraft.icns')) } args.push('-Xmx' + ConfigManager.getMaxRAM()) @@ -336,7 +336,7 @@ class ProcessBuilder { // Java Arguments if(process.platform === 'darwin'){ - args.push('-Xdock:name=WesterosCraft') + args.push('-Xdock:name=ElectronLauncher') args.push('-Xdock:icon=' + path.join(__dirname, '..', 'images', 'minecraft.icns')) } args.push('-Xmx' + ConfigManager.getMaxRAM()) @@ -438,7 +438,7 @@ class ProcessBuilder { val = args[i].replace(argDiscovery, tempNativePath) break case 'launcher_name': - val = args[i].replace(argDiscovery, 'WesterosCraft-Launcher') + val = args[i].replace(argDiscovery, 'Electron-Launcher') break case 'launcher_version': val = args[i].replace(argDiscovery, this.launcherVersion) diff --git a/app/assets/js/scripts/landing.js b/app/assets/js/scripts/landing.js index a4b9512..5affa8b 100644 --- a/app/assets/js/scripts/landing.js +++ b/app/assets/js/scripts/landing.js @@ -337,7 +337,7 @@ function asyncSystemScan(mcVersion, launchAfter = true){ //$('#overlayDismiss').toggle(false) setOverlayContent( 'Java is Required
to Launch', - 'A valid x64 installation of Java 8 is required to launch.

Please refer to our Java Management Guide for instructions on how to manually install Java.', + 'A valid x64 installation of Java 8 is required to launch.

Please refer to our Java Management Guide for instructions on how to manually install Java.', 'I Understand', 'Go Back' ) @@ -383,7 +383,7 @@ function asyncSystemScan(mcVersion, launchAfter = true){ // User will have to follow the guide to install Java. setOverlayContent( 'Unexpected Issue:
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 Troubleshooting Guide 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 Troubleshooting Guide for more details and instructions.', 'I Understand' ) setOverlayHandler(() => { @@ -674,7 +674,7 @@ function dlAsync(login = true){ data = data.trim() 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.') - showLaunchFailure('Error During Launch', 'The main file, LaunchWrapper, failed to download properly. As a result, the game cannot launch.

To fix this issue, temporarily turn off your antivirus software and launch the game again.

If you have time, please submit an issue 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.

To fix this issue, temporarily turn off your antivirus software and launch the game again.

If you have time, please submit an issue and let us know what antivirus software you use. We\'ll contact them and try to straighten things out.') } } diff --git a/app/assets/js/scripts/settings.js b/app/assets/js/scripts/settings.js index 5c5720e..08d01ea 100644 --- a/app/assets/js/scripts/settings.js +++ b/app/assets/js/scripts/settings.js @@ -1200,7 +1200,7 @@ function populateAboutVersionInformation(){ */ function populateReleaseNotes(){ $.ajax({ - url: 'https://github.com/WesterosCraftCode/ElectronLauncher/releases.atom', + url: 'https://github.com/dscalzi/ElectronLauncher/releases.atom', success: (data) => { const version = 'v' + remote.app.getVersion() const entries = $(data).find('entry') diff --git a/app/assets/js/scripts/uicore.js b/app/assets/js/scripts/uicore.js index 5ef0e14..db947a6 100644 --- a/app/assets/js/scripts/uicore.js +++ b/app/assets/js/scripts/uicore.js @@ -49,7 +49,7 @@ if(!isDev){ loggerAutoUpdaterSuccess.log('New update available', info.version) if(process.platform === 'darwin'){ - info.darwindownload = `https://github.com/WesterosCraftCode/ElectronLauncher/releases/download/v${info.version}/westeroscraftlauncher-${info.version}.dmg` + info.darwindownload = `https://github.com/dscalzi/ElectronLauncher/releases/download/v${info.version}/electronlauncher-${info.version}.dmg` showUpdateUI(info) } diff --git a/app/landing.ejs b/app/landing.ejs index ed64fcb..9ddf3ad 100644 --- a/app/landing.ejs +++ b/app/landing.ejs @@ -2,7 +2,7 @@
- +
Update Available
@@ -30,7 +30,7 @@
- + MINECRAFT LOGIN
@@ -57,7 +57,7 @@ Need an Account?

Your password is sent directly to mojang and never stored.

-

WesterosCraft is not affiliated with Mojang AB.

+

Electron Launcher is not affiliated with Mojang AB.

diff --git a/app/settings.ejs b/app/settings.ejs index 99cafa8..0f91a7f 100644 --- a/app/settings.ejs +++ b/app/settings.ejs @@ -277,8 +277,8 @@
diff --git a/app/welcome.ejs b/app/welcome.ejs index 1fccca7..077bbae 100644 --- a/app/welcome.ejs +++ b/app/welcome.ejs @@ -4,7 +4,7 @@
-->
- + WELCOME TO WESTEROSCRAFT Our mission is to recreate the universe imagined by author George RR Martin in his fantasy series, A Song of Ice and Fire. Through the collaborative effort of thousands of community members, we have sought to create Westeros as accurately and precisely as possible within Minecraft. The world we are creating is yours to explore. Journey from Dorne to Castle Black, and if you aren’t afraid, beyond the Wall itself, but best not delay. As the words of House Stark ominously warn: Winter is Coming.
diff --git a/index.js b/index.js index 0724732..4f4f1ab 100644 --- a/index.js +++ b/index.js @@ -95,7 +95,7 @@ function createWindow() { win = new BrowserWindow({ width: 980, height: 552, - icon: getPlatformIcon('WesterosSealSquare'), + icon: getPlatformIcon('SealCircle'), frame: false, webPreferences: { preload: path.join(__dirname, 'app', 'assets', 'js', 'preloader.js'), diff --git a/package-lock.json b/package-lock.json index a719947..0934c30 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "westeroscraftlauncher", + "name": "electronlauncher", "version": "1.6.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index 41e412b..e66281f 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,13 @@ { - "name": "westeroscraftlauncher", + "name": "electronlauncher", "version": "1.6.0", - "productName": "WesterosCraft Launcher", + "productName": "Electron Launcher", "description": "Modded Minecraft Launcher", "author": "Daniel Scalzi (https://github.com/dscalzi/)", "license": "UNLICENSED", - "homepage": "https://github.com/WesterosCraftCode/ElectronLauncher", + "homepage": "https://github.com/dscalzi/ElectronLauncher", "bugs": { - "url": "https://github.com/WesterosCraftCode/ElectronLauncher/issues" + "url": "https://github.com/dscalzi/ElectronLauncher/issues" }, "private": true, "main": "index.js", @@ -47,13 +47,13 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/WesterosCraftCode/ElectronLauncher.git" + "url": "git+https://github.com/dscalzi/ElectronLauncher.git" }, "build": { - "appId": "westeroscraftlauncher", - "productName": "WesterosCraft Launcher", + "appId": "electronlauncher", + "productName": "Electron Launcher", "artifactName": "${productName}.${ext}", - "copyright": "Copyright © 2018 WesterosCraft", + "copyright": "Copyright © 2018-2019 Daniel Scalzi", "directories": { "buildResources": "build", "output": "dist" @@ -83,9 +83,9 @@ "linux": { "target": "AppImage", "maintainer": "Daniel Scalzi", - "vendor": "WesterosCraft", - "synopsis": "Custom Launcher for WesterosCraft", - "description": "Custom launcher which allows users to join WesterosCraft. All mods, configurations, and updates are handled automatically.", + "vendor": "Daniel Scalzi", + "synopsis": "Modded Minecraft Launcher", + "description": "Custom launcher which allows users to join modded servers. All mods, configurations, and updates are handled automatically.", "category": "Game" }, "deb": {