diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index e338313de4..0000000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1,3 +0,0 @@ -github: dscalzi -patreon: dscalzi -custom: ['https://www.paypal.me/dscalzi'] diff --git a/LICENSE.txt b/LICENSE.txt deleted file mode 100644 index a92150f240..0000000000 --- a/LICENSE.txt +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2017-2024 Daniel D. Scalzi - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file diff --git a/README.md b/README.md index ce117b3a16..26410ce2bd 100644 --- a/README.md +++ b/README.md @@ -1,211 +1 @@ -

aventium softworks

- -

Helios Launcher

- -
(formerly Electron Launcher)
 - -[

gh actions](https://github.com/dscalzi/HeliosLauncher/actions) [downloads](https://github.com/dscalzi/HeliosLauncher/releases) winter-is-coming

- -

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

- -![Screenshot 1](https://i.imgur.com/6o7SmH6.png) -![Screenshot 2](https://i.imgur.com/x3B34n1.png) - -## Features - -* πŸ”’ Full account management. - * Add multiple accounts and easily switch between them. - * Microsoft (OAuth 2.0) + Mojang (Yggdrasil) authentication fully supported. - * Credentials are never stored and transmitted directly to Mojang. -* πŸ“‚ Efficient asset management. - * Receive client updates as soon as we release them. - * Files are validated before launch. Corrupt or incorrect files will be redownloaded. -* β˜• **Automatic Java validation.** - * If you have an incompatible version of Java installed, we'll install the right one *for you*. - * You do not need to have Java installed to run the launcher. -* πŸ“° News feed natively built into the launcher. -* βš™οΈ Intuitive settings management, including a Java control panel. -* Supports all of our servers. - * Switch between server configurations with ease. - * View the player count of the selected server. -* Automatic updates. That's right, the launcher updates itself. -* View the status of Mojang's services. - -This is not an exhaustive list. Download and install the launcher to gauge all it can do! - -#### Need Help? [Check the wiki.][wiki] - -#### Like the project? Leave a ⭐ star on the repository! - -## Downloads - -You can download from [GitHub Releases](https://github.com/dscalzi/HeliosLauncher/releases) - -#### Latest Release - -[![](https://img.shields.io/github/release/dscalzi/HeliosLauncher.svg?style=flat-square)](https://github.com/dscalzi/HeliosLauncher/releases/latest) - -#### Latest Pre-Release -[![](https://img.shields.io/github/release/dscalzi/HeliosLauncher/all.svg?style=flat-square)](https://github.com/dscalzi/HeliosLauncher/releases) - -**Supported Platforms** - -If you download from the [Releases](https://github.com/dscalzi/HeliosLauncher/releases) tab, select the installer for your system. - -| Platform | File | -| -------- | ---- | -| Windows x64 | `Helios-Launcher-setup-VERSION.exe` | -| macOS x64 | `Helios-Launcher-setup-VERSION-x64.dmg` | -| macOS arm64 | `Helios-Launcher-setup-VERSION-arm64.dmg` | -| Linux x64 | `Helios-Launcher-setup-VERSION.AppImage` | - -## Console - -To open the console, use the following keybind. - -```console -ctrl + shift + i -``` - -Ensure that you have the console tab selected. Do not paste anything into the console unless you are 100% sure of what it will do. Pasting the wrong thing can expose sensitive information. - -#### Export Output to a File - -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/T5e73jP.png) - - -## Development - -This section details the setup of a basic developmentment environment. - -### Getting Started - -**System Requirements** - -* [Node.js][nodejs] v20 - ---- - -**Clone and Install Dependencies** - -```console -> git clone https://github.com/dscalzi/HeliosLauncher.git -> cd HeliosLauncher -> npm install -``` - ---- - -**Launch Application** - -```console -> npm start -``` - ---- - -**Build Installers** - -To build for your current platform. - -```console -> npm run dist -``` - -Build for a specific platform. - -| Platform | Command | -| ----------- | -------------------- | -| Windows x64 | `npm run dist:win` | -| macOS | `npm run dist:mac` | -| Linux x64 | `npm run dist:linux` | - -Builds for macOS may not work on Windows/Linux and vice-versa. - ---- - -### Visual Studio Code - -All development of the launcher should be done using [Visual Studio Code][vscode]. - -Paste the following into `.vscode/launch.json` - -```JSON -{ - "version": "0.2.0", - "configurations": [ - { - "name": "Debug Main Process", - "type": "node", - "request": "launch", - "cwd": "${workspaceFolder}", - "program": "${workspaceFolder}/node_modules/electron/cli.js", - "args" : ["."], - "outputCapture": "std" - }, - { - "name": "Debug Renderer Process", - "type": "chrome", - "request": "launch", - "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron", - "windows": { - "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron.cmd" - }, - "runtimeArgs": [ - "${workspaceFolder}/.", - "--remote-debugging-port=9222" - ], - "webRoot": "${workspaceFolder}" - } - ] -} -``` - -This adds two debug configurations. - -#### Debug Main Process - -This allows you to debug Electron's [main process][mainprocess]. You can debug scripts in the [renderer process][rendererprocess] by opening the DevTools Window. - -#### Debug Renderer Process - -This allows you to debug Electron's [renderer process][rendererprocess]. This requires you to install the [Debugger for Chrome][chromedebugger] extension. - -Note that you **cannot** open the DevTools window while using this debug configuration. Chromium only allows one debugger, opening another will crash the program. - ---- - -### Note on Third-Party Usage - -Please give credit to the original author and provide a link to the original source. This is free software, please do at least this much. - -For instructions on setting up Microsoft Authentication, see https://github.com/dscalzi/HeliosLauncher/blob/master/docs/MicrosoftAuth.md. - ---- - -## Resources - -* [Wiki][wiki] -* [Nebula (Create Distribution.json)][nebula] -* [v2 Rewrite Branch (Inactive)][v2branch] - -The best way to contact the developers is on Discord. - -[![discord](https://discordapp.com/api/guilds/211524927831015424/embed.png?style=banner3)][discord] - ---- - -### See you ingame. - - -[nodejs]: https://nodejs.org/en/ 'Node.js' -[vscode]: https://code.visualstudio.com/ 'Visual Studio Code' -[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' -[discord]: https://discord.gg/zNWUXdt 'Discord' -[wiki]: https://github.com/dscalzi/HeliosLauncher/wiki 'wiki' -[nebula]: https://github.com/dscalzi/Nebula 'dscalzi/Nebula' -[v2branch]: https://github.com/dscalzi/HeliosLauncher/tree/ts-refactor 'v2 branch' +# Kirkoc Launcher \ No newline at end of file diff --git a/app/app.ejs b/app/app.ejs index 75b5ea2859..1dee76ef20 100644 --- a/app/app.ejs +++ b/app/app.ejs @@ -40,8 +40,8 @@
- - + +
diff --git a/app/assets/css/launcher.css b/app/assets/css/launcher.css index 8b2393117e..0ef7ce4191 100644 --- a/app/assets/css/launcher.css +++ b/app/assets/css/launcher.css @@ -272,9 +272,9 @@ body, button { } */ -#welcomeImageSeal { - border-radius: 50%; - border: 2px solid #cad7e1; +#welcomeImageKirkoc { + /* border-radius: 50%; + border: 2px solid #cad7e1; */ background: rgba(1, 2, 1, 0.5); height: 125px; width: 125px; @@ -485,9 +485,9 @@ body, button { } /* Logo on login form. */ -#loginImageSeal { - border-radius: 50%; - border: 2px solid #cad7e1; +#loginImageKirkoc { + /* border-radius: 50%; + border: 2px solid #cad7e1; */ background: rgba(1, 2, 1, 0.5); height: 125px; width: 125px; @@ -2854,30 +2854,30 @@ input:checked + .toggleSwitchSlider:before { * * */ /* Logo image. */ -#image_seal { +#image_kirkoc { height: 70px; width: auto; position: relative; - border: 2px solid white; + /* border: 2px solid white; */ box-sizing: border-box; - border-radius: 50%; + /* border-radius: 50%; */ } /* Logo container styles. */ -#image_seal_container { +#image_kirkoc_container { position: relative; height: 70px; width: 70px; - border-radius: 50%; + /* border-radius: 50%; */ margin-top: 50px; } /* Logo container styles w/ update. */ -#image_seal_container[update]{ +#image_kirkoc_container[update]{ cursor: pointer } -#image_seal_container[update]:before, -#image_seal_container[update]:after { +#image_kirkoc_container[update]:before, +#image_kirkoc_container[update]:after { cursor: pointer; position: absolute; content: ''; @@ -2890,7 +2890,7 @@ input:checked + .toggleSwitchSlider:before { animation: glow-grow 4s ease-out infinite; background: rgba(0, 0, 0, 0.15); } -#image_seal_container[update]:before { +#image_kirkoc_container[update]:before { animation-delay: 2s; } @@ -2924,7 +2924,7 @@ input:checked + .toggleSwitchSlider:before { border-style: solid; border-color: transparent transparent rgb(0, 0, 0) transparent; } -#image_seal_container[update]:hover #updateAvailableTooltip { +#image_kirkoc_container[update]:hover #updateAvailableTooltip { visibility: visible; opacity: 1; transition-delay: 0s; diff --git a/app/assets/images/Loading.png b/app/assets/images/Loading.png new file mode 100644 index 0000000000..a55782c186 Binary files /dev/null and b/app/assets/images/Loading.png differ diff --git a/app/assets/images/LoadingSeal.png b/app/assets/images/LoadingSeal.png deleted file mode 100644 index afe2c4d404..0000000000 Binary files a/app/assets/images/LoadingSeal.png and /dev/null differ diff --git a/app/assets/images/LoadingText.png b/app/assets/images/LoadingText.png deleted file mode 100644 index 5e55b33245..0000000000 Binary files a/app/assets/images/LoadingText.png and /dev/null differ diff --git a/app/assets/images/SealCircle.ico b/app/assets/images/SealCircle.ico deleted file mode 100644 index e37b95df68..0000000000 Binary files a/app/assets/images/SealCircle.ico and /dev/null differ diff --git a/app/assets/images/SealCircle.png b/app/assets/images/SealCircle.png deleted file mode 100644 index 9e21d08be2..0000000000 Binary files a/app/assets/images/SealCircle.png and /dev/null differ diff --git a/app/assets/images/backgrounds/0.jpg b/app/assets/images/backgrounds/0.jpg deleted file mode 100644 index 66a2c12aab..0000000000 Binary files a/app/assets/images/backgrounds/0.jpg and /dev/null differ diff --git a/app/assets/images/backgrounds/0.png b/app/assets/images/backgrounds/0.png new file mode 100644 index 0000000000..0bb4e73c07 Binary files /dev/null and b/app/assets/images/backgrounds/0.png differ diff --git a/app/assets/images/backgrounds/1.jpg b/app/assets/images/backgrounds/1.jpg deleted file mode 100644 index e343cbe274..0000000000 Binary files a/app/assets/images/backgrounds/1.jpg and /dev/null differ diff --git a/app/assets/images/backgrounds/2.jpg b/app/assets/images/backgrounds/2.jpg deleted file mode 100644 index 7a13e77129..0000000000 Binary files a/app/assets/images/backgrounds/2.jpg and /dev/null differ diff --git a/app/assets/images/backgrounds/3.jpg b/app/assets/images/backgrounds/3.jpg deleted file mode 100644 index 5c7be569c4..0000000000 Binary files a/app/assets/images/backgrounds/3.jpg and /dev/null differ diff --git a/app/assets/images/backgrounds/4.jpg b/app/assets/images/backgrounds/4.jpg deleted file mode 100644 index 1db7800eeb..0000000000 Binary files a/app/assets/images/backgrounds/4.jpg and /dev/null differ diff --git a/app/assets/images/backgrounds/5.jpg b/app/assets/images/backgrounds/5.jpg deleted file mode 100644 index beb4b148e9..0000000000 Binary files a/app/assets/images/backgrounds/5.jpg and /dev/null differ diff --git a/app/assets/images/backgrounds/6.jpg b/app/assets/images/backgrounds/6.jpg deleted file mode 100644 index acdaa73ac6..0000000000 Binary files a/app/assets/images/backgrounds/6.jpg and /dev/null differ diff --git a/app/assets/images/backgrounds/7.jpg b/app/assets/images/backgrounds/7.jpg deleted file mode 100644 index cc48f72fd5..0000000000 Binary files a/app/assets/images/backgrounds/7.jpg and /dev/null differ diff --git a/app/assets/images/kirkoc.ico b/app/assets/images/kirkoc.ico new file mode 100644 index 0000000000..d3ac1cd63b Binary files /dev/null and b/app/assets/images/kirkoc.ico differ diff --git a/app/assets/images/kirkoc.png b/app/assets/images/kirkoc.png new file mode 100644 index 0000000000..a55782c186 Binary files /dev/null and b/app/assets/images/kirkoc.png differ diff --git a/app/assets/js/processbuilder.js b/app/assets/js/processbuilder.js index 0e95562182..72cfebbb04 100644 --- a/app/assets/js/processbuilder.js +++ b/app/assets/js/processbuilder.js @@ -368,7 +368,7 @@ class ProcessBuilder { // Java Arguments if(process.platform === 'darwin'){ - args.push('-Xdock:name=HeliosLauncher') + args.push('-Xdock:name=Kirkoc Launcher') args.push('-Xdock:icon=' + path.join(__dirname, '..', 'images', 'minecraft.icns')) } args.push('-Xmx' + ConfigManager.getMaxRAM(this.server.rawServer.id)) @@ -419,7 +419,7 @@ class ProcessBuilder { // Java Arguments if(process.platform === 'darwin'){ - args.push('-Xdock:name=HeliosLauncher') + args.push('-Xdock:name=Kirkoc Launcher') args.push('-Xdock:icon=' + path.join(__dirname, '..', 'images', 'minecraft.icns')) } args.push('-Xmx' + ConfigManager.getMaxRAM(this.server.rawServer.id)) @@ -521,7 +521,7 @@ class ProcessBuilder { val = args[i].replace(argDiscovery, tempNativePath) break case 'launcher_name': - val = args[i].replace(argDiscovery, 'Helios-Launcher') + val = args[i].replace(argDiscovery, 'Kirkoc-Launcher') break case 'launcher_version': val = args[i].replace(argDiscovery, this.launcherVersion) diff --git a/app/assets/js/scripts/uibinder.js b/app/assets/js/scripts/uibinder.js index 5fe79df5e7..59650eaf30 100644 --- a/app/assets/js/scripts/uibinder.js +++ b/app/assets/js/scripts/uibinder.js @@ -69,7 +69,7 @@ async function showMainUI(data){ refreshServerStatus() setTimeout(() => { document.getElementById('frameBar').style.backgroundColor = 'rgba(0, 0, 0, 0.5)' - document.body.style.backgroundImage = `url('assets/images/backgrounds/${document.body.getAttribute('bkid')}.jpg')` + document.body.style.backgroundImage = `url('assets/images/backgrounds/${document.body.getAttribute('bkid')}.png')` $('#main').show() const isLoggedIn = Object.keys(ConfigManager.getAuthAccounts()).length > 0 diff --git a/app/assets/js/scripts/uicore.js b/app/assets/js/scripts/uicore.js index 02e9b5dafe..a08f7e772f 100644 --- a/app/assets/js/scripts/uicore.js +++ b/app/assets/js/scripts/uicore.js @@ -49,7 +49,7 @@ if(!isDev){ loggerAutoUpdater.info('New update available', info.version) if(process.platform === 'darwin'){ - info.darwindownload = `https://github.com/dscalzi/HeliosLauncher/releases/download/v${info.version}/Helios-Launcher-setup-${info.version}${process.arch === 'arm64' ? '-arm64' : '-x64'}.dmg` + info.darwindownload = `https://github.com/Kirkoc/Launcher/releases/download/v${info.version}/Kirkoc-Launcher-setup-${info.version}${process.arch === 'arm64' ? '-arm64' : '-x64'}.dmg` showUpdateUI(info) } @@ -107,8 +107,8 @@ function changeAllowPrerelease(val){ function showUpdateUI(info){ //TODO Make this message a bit more informative `${info.version}` - document.getElementById('image_seal_container').setAttribute('update', true) - document.getElementById('image_seal_container').onclick = () => { + document.getElementById('image_kirkoc_container').setAttribute('update', true) + document.getElementById('image_kirkoc_container').onclick = () => { /*setOverlayContent('Update Available', 'A new update for the launcher is available. Would you like to install now?', 'Install', 'Later') setOverlayHandler(() => { if(!isDev){ diff --git a/app/assets/lang/_custom.toml b/app/assets/lang/_custom.toml index 6cfb15a9cb..629d9daf1f 100644 --- a/app/assets/lang/_custom.toml +++ b/app/assets/lang/_custom.toml @@ -15,6 +15,6 @@ sourceGithubLink = "https://github.com/Kirkoc/Launcher" supportLink = "https://github.com/Kirkoc/Launcher/issues" [ejs.welcome] -welcomeHeader = "WELCOME TO WESTEROSCRAFT" -welcomeDescription = "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." -welcomeDescCTA = "You are just a few clicks away from Westeros." +welcomeHeader = "WELCOME" +welcomeDescription = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Molestie a iaculis at erat pellentesque adipiscing commodo. Suscipit tellus mauris a diam maecenas. Vestibulum sed arcu non odio euismod lacinia. Fermentum posuere urna nec tincidunt. Rhoncus est pellentesque elit ullamcorper dignissim cras. Faucibus scelerisque eleifend donec pretium. Elementum sagittis vitae et leo duis. Dictum at tempor commodo ullamcorper a lacus vestibulum. Libero enim sed faucibus turpis in eu mi bibendum neque." +welcomeDescCTA = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec sed posuere quam." diff --git a/app/landing.ejs b/app/landing.ejs index 5ac72a1558..9bc2249f18 100644 --- a/app/landing.ejs +++ b/app/landing.ejs @@ -1,8 +1,8 @@