From 52fa2f7f251687e50f86a5901d4e91d3c40f2ed6 Mon Sep 17 00:00:00 2001 From: damp11113 Date: Tue, 1 Oct 2024 18:33:13 +0700 Subject: [PATCH 1/7] update something for new add DPCloudev account and more... --- README.md | 174 +------------------------- app/app.ejs | 25 +++- app/assets/css/launcher.css | 2 +- app/assets/js/authmanager.js | 79 ++++++++++++ app/assets/js/configmanager.js | 12 ++ app/assets/js/scripts/landing.js | 102 ++++++++++++++- app/assets/js/scripts/login.js | 2 +- app/assets/js/scripts/loginOptions.js | 2 +- app/assets/js/scripts/settings.js | 2 +- app/assets/lang/_custom.toml | 14 +-- app/assets/lang/en_US.toml | 16 +-- app/frame.ejs | 2 +- app/landing.ejs | 11 ++ app/login.ejs | 1 - app/loginOptions.ejs | 74 +++++++++-- app/settings.ejs | 73 +++++++++-- app/waiting.ejs | 2 +- index.js | 4 +- package-lock.json | 46 +++++-- package.json | 1 + 20 files changed, 423 insertions(+), 221 deletions(-) diff --git a/README.md b/README.md index ce117b3..0716f05 100644 --- a/README.md +++ b/README.md @@ -1,80 +1,6 @@ -

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) +# Unknow-DMB Project Launcher +Based on Helios Launcher ## Development @@ -84,28 +10,20 @@ This section details the setup of a basic developmentment environment. **System Requirements** -* [Node.js][nodejs] v20 - ---- +- 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. @@ -123,89 +41,3 @@ Build for a specific platform. | 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' diff --git a/app/app.ejs b/app/app.ejs index 75b5ea2..cf48014 100644 --- a/app/app.ejs +++ b/app/app.ejs @@ -39,10 +39,27 @@ <%- include('overlay') %>
-
- - -
+ +

Please wait...

+
diff --git a/app/assets/css/launcher.css b/app/assets/css/launcher.css index 8b23931..58618a4 100644 --- a/app/assets/css/launcher.css +++ b/app/assets/css/launcher.css @@ -3223,7 +3223,7 @@ input:checked + .toggleSwitchSlider:before { } /* Icon which displays the status of the mojang services. */ -#mojang_status_icon { +#mojang_status_icon, #DPCloudev_status_icon { font-size: 30px; color: #848484; margin-left: 15px; diff --git a/app/assets/js/authmanager.js b/app/assets/js/authmanager.js index 5a24f30..dda4d28 100644 --- a/app/assets/js/authmanager.js +++ b/app/assets/js/authmanager.js @@ -167,6 +167,57 @@ exports.addMojangAccount = async function(username, password) { } } +const axios = require('axios'); + +exports.addDPCloudevAccount = async function(username, password) { + try { + const response = await axios.post('https://api.damp11113.xyz/account/v3/login', { + username: username, + password: password + }, { + headers: { + 'Content-Type': 'application/json' + } + }); + + console.log(response.data); + + if (response.data && response.data.session) { + const responseinfo = await axios.post('https://api.damp11113.xyz/account/v3/info', { + clientToken: response.data.clientToken, + }, { + headers: { + 'Content-Type': 'application/json' + } + }); + + console.log(responseinfo.data); + + const ret = ConfigManager.addDPCloudevAuthAccount( + responseinfo.data.uuid, + response.data.session, + username, + responseinfo.data.username + ); + + if (ConfigManager.getClientToken() == null) { + ConfigManager.setClientToken(response.data.clientToken); + } + ConfigManager.save(); + return ret; + + } else { + return Promise.reject(mojangErrorDisplayable(response.data.error || MojangErrorCode.UNKNOWN)); + } + + } catch (err) { + console.error(err); + return Promise.reject(mojangErrorDisplayable(MojangErrorCode.UNKNOWN)); + } +}; + + + const AUTH_MODE = { FULL: 0, MS_REFRESH: 1, MC_REFRESH: 2 } /** @@ -291,6 +342,34 @@ exports.removeMojangAccount = async function(uuid){ } } +exports.removeDPCloudevAccount = async function(uuid){ + try { + const authAcc = ConfigManager.getAuthAccount(uuid) + console.log(authAcc.accessToken) + console.log(ConfigManager.getClientToken()) + const response = await axios.post('https://api.damp11113.xyz/account/v3/logout', { + session: authAcc.accessToken, + clientToken: ConfigManager.getClientToken() + }, { + headers: { + 'Content-Type': 'application/json' + } + }); + + if (response.status === 200) { + ConfigManager.removeAuthAccount(uuid) + ConfigManager.save() + return Promise.resolve() + } else { + log.error('Error while removing account', response.error) + return Promise.reject(response.error) + } + } catch (err){ + log.error('Error while removing account', err) + return Promise.reject(err) + } +} + /** * Remove a Microsoft account. It is expected that the caller will invoke the OAuth logout * through the ipc renderer. diff --git a/app/assets/js/configmanager.js b/app/assets/js/configmanager.js index 38f864f..8f3e7b1 100644 --- a/app/assets/js/configmanager.js +++ b/app/assets/js/configmanager.js @@ -349,6 +349,18 @@ exports.addMojangAuthAccount = function(uuid, accessToken, username, displayName return config.authenticationDatabase[uuid] } +exports.addDPCloudevAuthAccount = function(uuid, accessToken, username, displayName){ + config.selectedAccount = uuid + config.authenticationDatabase[uuid] = { + type: 'dpcloudev', + accessToken, + username: username.trim(), + uuid: uuid.trim(), + displayName: displayName.trim() + } + return config.authenticationDatabase[uuid] +} + /** * Update the tokens of an authenticated microsoft account. * diff --git a/app/assets/js/scripts/landing.js b/app/assets/js/scripts/landing.js index 1a1c176..24c6fb0 100644 --- a/app/assets/js/scripts/landing.js +++ b/app/assets/js/scripts/landing.js @@ -2,6 +2,8 @@ * Script for landing.ejs */ // Requirements +const axios = require('axios'); + const { URL } = require('url') const { MojangRestAPI, @@ -195,7 +197,7 @@ const refreshMojangStatuses = async function(){ greenCount = 0 greyCount = 0 - + console.log(statuses) for(let i=0; i { + switch (status) { + case 200: + return 'green'; + case 500: + return 'red'; + case 429: // Example for too many requests + case 503: // Example for service unavailable + return 'yellow'; + default: + return 'grey'; // Default for unexpected status codes + } +}; + +const refreshDPCloudevStatuses = async function(){ + loggerLanding.info('Refreshing DPCloudev Statuses..') + + let status = 'grey' + let tooltipNonEssentialHTML = '' + const servicesToInclude = ['API', 'CDN', 'Dashboard']; + + const response = await axios.get("https://status.damp11113.xyz/") + console.log(response) + let statuses + if (response.status === 200) { + // Convert the data into the desired array format, filtering for specific services + statuses = servicesToInclude.map(serviceName => ({ + service: serviceName, + status: DPCloudevgetColorFromStatus(response.data.Service[serviceName.toLowerCase()]), + name: serviceName // Assuming 'name' is the same as the 'service' + })); + } else { + loggerLanding.warn('Unable to refresh DPCloudev service status.') + statuses = [ + { "service": "api", "status": "red", "name": "API" }, + { "service": "cdn", "status": "red", "name": "CDN" }, + { "service": "dashboard", "status": "red", "name": "Dashboard" } + ] + } + + greenCount = 0 + greyCount = 0 + + + for (let i=0; i + • + ${service.name} + ` + tooltipNonEssentialHTML += tooltipHTML + + if(service.status === 'yellow' && status !== 'red'){ + status = 'yellow' + } else if(service.status === 'red'){ + status = 'red' + } else { + if(service.status === 'grey'){ + ++greyCount + } + ++greenCount + } + } + + if(greenCount === statuses.length){ + if(greyCount === statuses.length){ + status = 'grey' + } else { + status = 'green' + } + } + + document.getElementById('dpcloudevStatusContainer').innerHTML = tooltipNonEssentialHTML + document.getElementById('DPCloudev_status_icon').style.color = MojangRestAPI.statusToHex(status) +} + + const refreshServerStatus = async (fade = false) => { loggerLanding.info('Refreshing Server Status') const serv = (await DistroAPI.getDistribution()).getServerById(ConfigManager.getSelectedServer()) @@ -267,10 +363,12 @@ const refreshServerStatus = async (fade = false) => { } refreshMojangStatuses() +refreshDPCloudevStatuses() // Server Status is refreshed in uibinder.js on distributionIndexDone. // Refresh statuses every hour. The status page itself refreshes every day so... let mojangStatusListener = setInterval(() => refreshMojangStatuses(true), 60*60*1000) +let DPCloudevStatusListener = setInterval(() => refreshDPCloudevStatuses(true), 60*60*1000) // Set refresh rate to once every 5 minutes. let serverStatusListener = setInterval(() => refreshServerStatus(true), 300000) @@ -615,6 +713,7 @@ async function dlAsync(login = true) { setLaunchDetails(Lang.queryJS('landing.dlAsync.doneEnjoyServer')) // Init Discord Hook + /* if(distro.rawDistribution.discord != null && serv.rawServer.discord != null){ DiscordWrapper.initRPC(distro.rawDistribution.discord, serv.rawServer.discord) hasRPC = true @@ -625,6 +724,7 @@ async function dlAsync(login = true) { proc = null }) } + */ } catch(err) { diff --git a/app/assets/js/scripts/login.js b/app/assets/js/scripts/login.js index 30ff893..e38d036 100644 --- a/app/assets/js/scripts/login.js +++ b/app/assets/js/scripts/login.js @@ -187,7 +187,7 @@ loginButton.addEventListener('click', () => { // Show loading stuff. loginLoading(true) - AuthManager.addMojangAccount(loginUsername.value, loginPassword.value).then((value) => { + AuthManager.addDPCloudevAccount(loginUsername.value, loginPassword.value).then((value) => { updateSelectedAccount(value) loginButton.innerHTML = loginButton.innerHTML.replace(Lang.queryJS('login.loggingIn'), Lang.queryJS('login.success')) $('.circle-loader').toggleClass('load-complete') diff --git a/app/assets/js/scripts/loginOptions.js b/app/assets/js/scripts/loginOptions.js index cdb1bc8..29b5478 100644 --- a/app/assets/js/scripts/loginOptions.js +++ b/app/assets/js/scripts/loginOptions.js @@ -28,7 +28,7 @@ loginOptionMicrosoft.onclick = (e) => { }) } -loginOptionMojang.onclick = (e) => { +loginOptionDPCloudev.onclick = (e) => { switchView(getCurrentView(), VIEWS.login, 500, 500, () => { loginViewOnSuccess = loginOptionsViewOnLoginSuccess loginViewOnCancel = loginOptionsViewOnLoginCancel diff --git a/app/assets/js/scripts/settings.js b/app/assets/js/scripts/settings.js index 81a65a7..6b76a1a 100644 --- a/app/assets/js/scripts/settings.js +++ b/app/assets/js/scripts/settings.js @@ -519,7 +519,7 @@ function processLogOut(val, isLastAccount){ ipcRenderer.send(MSFT_OPCODE.OPEN_LOGOUT, uuid, isLastAccount) }) } else { - AuthManager.removeMojangAccount(uuid).then(() => { + AuthManager.removeDPCloudevAccount(uuid).then(() => { if(!isLastAccount && uuid === prevSelAcc.uuid){ const selAcc = ConfigManager.getSelectedAccount() refreshAuthAccountSelected(selAcc.uuid) diff --git a/app/assets/lang/_custom.toml b/app/assets/lang/_custom.toml index da17faf..53eda4a 100644 --- a/app/assets/lang/_custom.toml +++ b/app/assets/lang/_custom.toml @@ -1,20 +1,20 @@ # Custom Language File for Launcher Customizer [ejs.app] -title = "Helios Launcher" +title = "Unknow DMB" [ejs.landing] -mediaGitHubURL = "https://github.com/dscalzi/HeliosLauncher" +mediaGitHubURL = "https://git.damp11113.xyz/Mirror/unknow-dmb" mediaTwitterURL = "#" mediaInstagramURL = "#" mediaYouTubeURL = "#" mediaDiscordURL = "https://discord.gg/zNWUXdt" [ejs.settings] -sourceGithubLink = "https://github.com/dscalZi/HeliosLauncher" -supportLink = "https://github.com/dscalZi/HeliosLauncher/issues" +sourceGithubLink = "https://git.damp11113.xyz/Mirror/unknow-dmb" +supportLink = "https://damp11113.xyz/donate" [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 to Unknow-DMB Project" +welcomeDescription = "Hello world!" +welcomeDescCTA = "Hello world!" diff --git a/app/assets/lang/en_US.toml b/app/assets/lang/en_US.toml index b9f64cf..06d556f 100644 --- a/app/assets/lang/en_US.toml +++ b/app/assets/lang/en_US.toml @@ -20,24 +20,24 @@ newsErrorNoneSpan = "No News" [ejs.login] loginCancelText = "Cancel" -loginSubheader = "MINECRAFT LOGIN" +loginSubheader = "DPCloudev LOGIN" loginEmailError = "* Invalid Value" -loginEmailPlaceholder = "EMAIL OR USERNAME" +loginEmailPlaceholder = "USERNAME" loginPasswordError = "* Required" loginPasswordPlaceholder = "PASSWORD" -loginForgotPasswordLink = "https://minecraft.net/password/forgot/" +loginForgotPasswordLink = "https://dashboard.damp11113.xyz/forgotpw" loginForgotPasswordText = "forgot password?" loginRememberMeText = "remember me?" loginButtonText = "LOGIN" -loginNeedAccountLink = "https://minecraft.net/store/minecraft-java-edition/" +loginNeedAccountLink = "https://dashboard.damp11113.xyz/register" loginNeedAccountText = "Need an Account?" -loginPasswordDisclaimer1 = "Your password is sent directly to mojang and never stored." +loginPasswordDisclaimer1 = "Your password is sent directly to DPCloudev and never stored." loginPasswordDisclaimer2 = "{appName} is not affiliated with Mojang AB." [ejs.loginOptions] loginOptionsTitle = "Login Options" loginWithMicrosoft = "Login with Microsoft" -loginWithMojang = "Login with Mojang" +loginWithDPCloudev = "Login with DPCloudev (Free user)" cancelButton = "Cancel" [ejs.overlay] @@ -62,8 +62,8 @@ tabAccountHeaderText = "Account Settings" tabAccountHeaderDesc = "Add new accounts or manage existing ones." microsoftAccount = "Microsoft" addMicrosoftAccount = "+ Add Microsoft Account" -mojangAccount = "Mojang" -addMojangAccount = "+ Add Mojang Account" +DPCloudevAccount = "DPCloudev" +addDPCloudevAccount = "+ Add DPCloudev Account" minecraftTabHeaderText = "Minecraft Settings" minecraftTabHeaderDesc = "Options related to game launch." gameResolutionTitle = "Game Resolution" diff --git a/app/frame.ejs b/app/frame.ejs index 1151f91..d4d991a 100644 --- a/app/frame.ejs +++ b/app/frame.ejs @@ -13,7 +13,7 @@ <% } else{ %>
- <%= lang('app.title') %> + <%= lang('app.title') %> | Powered by DPCloudev
+
+
+ DPClOUDEV STATUS + • +
+
<%- lang('landing.mojangStatusTooltipTitle') %>
+
+ +
+
+
diff --git a/app/login.ejs b/app/login.ejs index 2da8072..a6b1791 100644 --- a/app/login.ejs +++ b/app/login.ejs @@ -7,7 +7,6 @@
- <%- lang('login.loginSubheader') %>
diff --git a/app/loginOptions.ejs b/app/loginOptions.ejs index 20aa67c..aece220 100644 --- a/app/loginOptions.ejs +++ b/app/loginOptions.ejs @@ -15,13 +15,73 @@
-
diff --git a/app/settings.ejs b/app/settings.ejs index 3fda82a..62d2566 100644 --- a/app/settings.ejs +++ b/app/settings.ejs @@ -52,15 +52,74 @@
- - - - - - <%- lang('settings.mojangAccount') %> + + <%- lang('settings.DPCloudevAccount') %>
- +
diff --git a/app/waiting.ejs b/app/waiting.ejs index c64726f..45b8e55 100644 --- a/app/waiting.ejs +++ b/app/waiting.ejs @@ -2,7 +2,7 @@
-

<%- lang('waiting.waitingText') %>

+

Please wait...

\ No newline at end of file diff --git a/index.js b/index.js index 7060c3c..3620fc7 100644 --- a/index.js +++ b/index.js @@ -227,8 +227,8 @@ let win function createWindow() { win = new BrowserWindow({ - width: 980, - height: 552, + width: 1280, + height: 720, icon: getPlatformIcon('SealCircle'), frame: false, webPreferences: { diff --git a/package-lock.json b/package-lock.json index 06eee52..709dbc9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,7 @@ "dependencies": { "@electron/remote": "^2.1.2", "adm-zip": "^0.5.12", + "axios": "^1.7.7", "discord-rpc-patch": "^4.0.1", "ejs": "^3.1.10", "ejs-electron": "^3.0.0", @@ -1084,8 +1085,7 @@ "node_modules/asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "dev": true + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, "node_modules/at-least-node": { "version": "1.0.0", @@ -1096,6 +1096,17 @@ "node": ">= 4.0.0" } }, + "node_modules/axios": { + "version": "1.7.7", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz", + "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==", + "license": "MIT", + "dependencies": { + "follow-redirects": "^1.15.6", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, "node_modules/b4a": { "version": "1.6.6", "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.6.tgz", @@ -1502,7 +1513,6 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, "dependencies": { "delayed-stream": "~1.0.0" }, @@ -1743,7 +1753,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "dev": true, "engines": { "node": ">=0.4.0" } @@ -2459,6 +2468,26 @@ "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz", "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==" }, + "node_modules/follow-redirects": { + "version": "1.15.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", + "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "license": "MIT", + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, "node_modules/foreground-child": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", @@ -2479,7 +2508,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "dev": true, "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -3398,7 +3426,6 @@ "version": "1.52.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true, "engines": { "node": ">= 0.6" } @@ -3407,7 +3434,6 @@ "version": "2.1.35", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, "dependencies": { "mime-db": "1.52.0" }, @@ -3759,6 +3785,12 @@ "node": ">=10" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "license": "MIT" + }, "node_modules/pump": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", diff --git a/package.json b/package.json index f38d9f6..40af98e 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "dependencies": { "@electron/remote": "^2.1.2", "adm-zip": "^0.5.12", + "axios": "^1.7.7", "discord-rpc-patch": "^4.0.1", "ejs": "^3.1.10", "ejs-electron": "^3.0.0", From 83c32a0ca3c600691bf85e8e571efb22afea2575 Mon Sep 17 00:00:00 2001 From: damp11113 Date: Tue, 1 Oct 2024 20:50:58 +0700 Subject: [PATCH 2/7] update --- LICENSE.txt => LICENSE.txt.old | 0 README.md | 2 +- app/assets/js/scripts/landing.js | 12 ++++++---- app/assets/js/scripts/settings.js | 12 +++++++--- app/assets/lang/_custom.toml | 4 ++-- app/landing.ejs | 2 ++ distro.json | 39 +++++++++++++++++++++++++++++++ docs/sample_distribution.json | 2 +- 8 files changed, 62 insertions(+), 11 deletions(-) rename LICENSE.txt => LICENSE.txt.old (100%) create mode 100644 distro.json diff --git a/LICENSE.txt b/LICENSE.txt.old similarity index 100% rename from LICENSE.txt rename to LICENSE.txt.old diff --git a/README.md b/README.md index 0716f05..ad1757f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# Unknow-DMB Project Launcher +# DMB Project Launcher Based on Helios Launcher ## Development diff --git a/app/assets/js/scripts/landing.js b/app/assets/js/scripts/landing.js index 24c6fb0..40c1751 100644 --- a/app/assets/js/scripts/landing.js +++ b/app/assets/js/scripts/landing.js @@ -150,8 +150,12 @@ function updateSelectedAccount(authUser){ if(authUser.displayName != null){ username = authUser.displayName } - if(authUser.uuid != null){ - document.getElementById('avatarContainer').style.backgroundImage = `url('https://mc-heads.net/body/${authUser.uuid}/right')` + if (authUser.type != "dpcloudev") { + if (authUser.uuid != null){ + document.getElementById('avatarContainer').style.backgroundImage = `url('https://mc-heads.net/body/${authUser.uuid}/right')` + } + } else { + document.getElementById('avatarContainer').style.backgroundImage = `` } } user_text.innerHTML = username @@ -713,7 +717,7 @@ async function dlAsync(login = true) { setLaunchDetails(Lang.queryJS('landing.dlAsync.doneEnjoyServer')) // Init Discord Hook - /* + if(distro.rawDistribution.discord != null && serv.rawServer.discord != null){ DiscordWrapper.initRPC(distro.rawDistribution.discord, serv.rawServer.discord) hasRPC = true @@ -724,7 +728,7 @@ async function dlAsync(login = true) { proc = null }) } - */ + } catch(err) { diff --git a/app/assets/js/scripts/settings.js b/app/assets/js/scripts/settings.js index 6b76a1a..e9e6600 100644 --- a/app/assets/js/scripts/settings.js +++ b/app/assets/js/scripts/settings.js @@ -635,13 +635,19 @@ function populateAuthAccounts(){ let microsoftAuthAccountStr = '' let mojangAuthAccountStr = '' + authKeys.forEach((val) => { const acc = authAccounts[val] + let skinimage = `` + + if (acc.type != "dpcloudev") { + skinimage = `
+ ${acc.displayName} +
` + } const accHtml = `
-
- ${acc.displayName} -
+ ${skinimage}
diff --git a/app/assets/lang/_custom.toml b/app/assets/lang/_custom.toml index 53eda4a..4bc8510 100644 --- a/app/assets/lang/_custom.toml +++ b/app/assets/lang/_custom.toml @@ -1,7 +1,7 @@ # Custom Language File for Launcher Customizer [ejs.app] -title = "Unknow DMB" +title = "DMB" [ejs.landing] mediaGitHubURL = "https://git.damp11113.xyz/Mirror/unknow-dmb" @@ -15,6 +15,6 @@ sourceGithubLink = "https://git.damp11113.xyz/Mirror/unknow-dmb" supportLink = "https://damp11113.xyz/donate" [ejs.welcome] -welcomeHeader = "Welcome to Unknow-DMB Project" +welcomeHeader = "Welcome to DMB Project" welcomeDescription = "Hello world!" welcomeDescCTA = "Hello world!" diff --git a/app/landing.ejs b/app/landing.ejs index 949332c..b836a5b 100644 --- a/app/landing.ejs +++ b/app/landing.ejs @@ -12,9 +12,11 @@
<%- lang('landing.usernamePlaceholder') %> +
+ -
diff --git a/distro.json b/distro.json new file mode 100644 index 0000000..503ad74 --- /dev/null +++ b/distro.json @@ -0,0 +1,39 @@ +{ + "version": "1.0.0", + "discord": { + "clientId": "1290669565231108106", + "smallImageText": "", + "smallImageKey": "" + }, + "java": { + "adoptium": "https://adoptium.net/temurin/releases/?package=jdk&version=18", + "supported": ">=17", + "suggestedMajor": 18, + "ram": { + "recommended": 2048, + "minimum": 1024 + } + }, + "rss": "", + "servers": [ + { + "id": "DMB", + "name": "DMB Client", + "description": "", + "icon": "", + "version": "1.0", + "address": "localhost", + "minecraftVersion": "1.20.1", + "discord": { + "shortId": "Example", + "largeImageText": "WesterosCraft Example Server", + "largeImageKey": "server-example" + }, + "mainServer": true, + "autoconnect": true, + "modules": [ + "Module Objects Here" + ] + } + ] +} \ No newline at end of file diff --git a/docs/sample_distribution.json b/docs/sample_distribution.json index 57bdb24..e366936 100644 --- a/docs/sample_distribution.json +++ b/docs/sample_distribution.json @@ -224,7 +224,7 @@ "type": "ForgeMod", "artifact": { "size": 17376788, - "MD5": "370f4f1804c93f498f31af8dac509605", + "MD5": "370f4f1804c93f498f31af8dac509605", "url": "http://mc.westeroscraft.com/WesterosCraftLauncher/prod-1.11.2/mods/WesterosBlocks.jar" } }, From 88b34deda6a570a474a1fee6a7c28fcb8acd66d4 Mon Sep 17 00:00:00 2001 From: damp11113 Date: Wed, 2 Oct 2024 12:43:15 +0700 Subject: [PATCH 3/7] Update configmanager.js --- app/assets/js/configmanager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/js/configmanager.js b/app/assets/js/configmanager.js index 8f3e7b1..2a0cef9 100644 --- a/app/assets/js/configmanager.js +++ b/app/assets/js/configmanager.js @@ -7,7 +7,7 @@ const logger = LoggerUtil.getLogger('ConfigManager') const sysRoot = process.env.APPDATA || (process.platform == 'darwin' ? process.env.HOME + '/Library/Application Support' : process.env.HOME) -const dataPath = path.join(sysRoot, '.helioslauncher') +const dataPath = path.join(sysRoot, '.DPSlauncher') const launcherDir = require('@electron/remote').app.getPath('userData') From 6457ef66c34f6c7a219fecf6c8773a3db8fbf758 Mon Sep 17 00:00:00 2001 From: damp11113 Date: Sat, 5 Oct 2024 12:29:50 +0700 Subject: [PATCH 4/7] update something --- app/app.ejs | 2 +- app/assets/js/scripts/uicore.js | 1 + run.bat | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 run.bat diff --git a/app/app.ejs b/app/app.ejs index cf48014..c69c395 100644 --- a/app/app.ejs +++ b/app/app.ejs @@ -16,7 +16,7 @@ #main { display: none; height: calc(100% - 22px); - background: linear-gradient(to top, rgba(0, 0, 0, 0.75) 0%, rgba(0, 0, 0, 0) 100%); + background: linear-gradient(to top, rgba(0, 0, 0, 0.75) 0%, rgba(255, 255, 255, 0) 100%); width: 100%; position: absolute; z-index: 10; diff --git a/app/assets/js/scripts/uicore.js b/app/assets/js/scripts/uicore.js index 02e9b5d..7e042e7 100644 --- a/app/assets/js/scripts/uicore.js +++ b/app/assets/js/scripts/uicore.js @@ -30,6 +30,7 @@ remote.getCurrentWebContents().on('devtools-opened', () => { console.log('%cThe console is dark and full of terrors.', 'color: white; -webkit-text-stroke: 4px #a02d2a; font-size: 60px; font-weight: bold') console.log('%cIf you\'ve been told to paste something here, you\'re being scammed.', 'font-size: 16px') console.log('%cUnless you know exactly what you\'re doing, close this window.', 'font-size: 16px') + console.log("%cCheckout DPSoftware Foundation at dpsoftwarefoundation.org", 'font-size: 16px') }) // Disable zoom, needed for darwin. diff --git a/run.bat b/run.bat new file mode 100644 index 0000000..a01add9 --- /dev/null +++ b/run.bat @@ -0,0 +1 @@ +npm run start \ No newline at end of file From 9952c1239a3fcb231094e643acd9bbf2fef30332 Mon Sep 17 00:00:00 2001 From: damp11113 Date: Sun, 6 Oct 2024 00:41:10 +0700 Subject: [PATCH 5/7] update something new --- app/assets/js/distromanager.js | 3 ++- distro.json | 31 +++++++++++++++++++++++++------ 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/app/assets/js/distromanager.js b/app/assets/js/distromanager.js index 8ae8ca0..74f755f 100644 --- a/app/assets/js/distromanager.js +++ b/app/assets/js/distromanager.js @@ -4,7 +4,8 @@ const ConfigManager = require('./configmanager') // Old WesterosCraft url. // exports.REMOTE_DISTRO_URL = 'http://mc.westeroscraft.com/WesterosCraftLauncher/distribution.json' -exports.REMOTE_DISTRO_URL = 'https://helios-files.geekcorner.eu.org/distribution.json' +// exports.REMOTE_DISTRO_URL = 'https://helios-files.geekcorner.eu.org/distribution.json' +exports.REMOTE_DISTRO_URL = 'http://127.0.0.1:5500/distro.json' // for development only with vscode live share const api = new DistributionAPI( ConfigManager.getLauncherDirectory(), diff --git a/distro.json b/distro.json index 503ad74..fe2b22c 100644 --- a/distro.json +++ b/distro.json @@ -18,21 +18,40 @@ "servers": [ { "id": "DMB", - "name": "DMB Client", - "description": "", + "name": "DMB Server", + "description": "A best mc roleplay in Thailand", "icon": "", "version": "1.0", "address": "localhost", "minecraftVersion": "1.20.1", "discord": { - "shortId": "Example", - "largeImageText": "WesterosCraft Example Server", - "largeImageKey": "server-example" + "shortId": "Test", + "largeImageText": "", + "largeImageKey": "" }, "mainServer": true, "autoconnect": true, "modules": [ - "Module Objects Here" + + ] + }, + { + "id": "dpg-milsim", + "name": "DPGame something...", + "description": "DPCloudev x DPGame (look at id in distro.json)", + "icon": "", + "version": "1.0", + "address": "localhost", + "minecraftVersion": "1.20.1", + "discord": { + "shortId": "Test", + "largeImageText": "", + "largeImageKey": "" + }, + "mainServer": true, + "autoconnect": true, + "modules": [ + ] } ] From 0ad3419c76c61d7a693741bf72b7d3e4cd608e4a Mon Sep 17 00:00:00 2001 From: damp11113 Date: Wed, 30 Oct 2024 18:17:59 +0700 Subject: [PATCH 6/7] new update --- LICENSE.txt | 21 ++++ app/app.ejs | 172 ++++++++++++++++++++++++++++--- app/assets/js/configmanager.js | 9 +- app/assets/js/processbuilder.js | 4 +- app/assets/js/scripts/landing.js | 94 +++++++++-------- app/landing.ejs | 9 +- app/login.ejs | 72 +++++++++++++ app/settings.ejs | 2 +- app/waiting.ejs | 2 +- distro.json | 2 +- electron-builder.yml | 4 +- package.json | 14 +-- run.bat | 2 +- 13 files changed, 322 insertions(+), 85 deletions(-) create mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..914c7de --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2024 DPSoftware + +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/app/app.ejs b/app/app.ejs index c69c395..704f6d6 100644 --- a/app/app.ejs +++ b/app/app.ejs @@ -39,25 +39,169 @@ <%- include('overlay') %>
- +

Please wait...

+
+ + + + + DOPFoundation + + + Powered by + +
diff --git a/app/assets/js/configmanager.js b/app/assets/js/configmanager.js index 2a0cef9..2e0cb01 100644 --- a/app/assets/js/configmanager.js +++ b/app/assets/js/configmanager.js @@ -5,11 +5,12 @@ const path = require('path') const logger = LoggerUtil.getLogger('ConfigManager') -const sysRoot = process.env.APPDATA || (process.platform == 'darwin' ? process.env.HOME + '/Library/Application Support' : process.env.HOME) - -const dataPath = path.join(sysRoot, '.DPSlauncher') - +// Use Electron's 'userData' path directly for dataPath const launcherDir = require('@electron/remote').app.getPath('userData') +const dataPath = path.join(launcherDir, '.minecraft') + +logger.info('Data path is set to:', dataPath) + /** * Retrieve the absolute path of the launcher directory. diff --git a/app/assets/js/processbuilder.js b/app/assets/js/processbuilder.js index 0e95562..82791bd 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=DMBLauncher') 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=DMBLauncher') args.push('-Xdock:icon=' + path.join(__dirname, '..', 'images', 'minecraft.icns')) } args.push('-Xmx' + ConfigManager.getMaxRAM(this.server.rawServer.id)) diff --git a/app/assets/js/scripts/landing.js b/app/assets/js/scripts/landing.js index 40c1751..990d3b0 100644 --- a/app/assets/js/scripts/landing.js +++ b/app/assets/js/scripts/landing.js @@ -1040,11 +1040,9 @@ document.addEventListener('keydown', (e) => { */ function displayArticle(articleObject, index){ newsArticleTitle.innerHTML = articleObject.title - newsArticleTitle.href = articleObject.link newsArticleAuthor.innerHTML = 'by ' + articleObject.author newsArticleDate.innerHTML = articleObject.date - newsArticleComments.innerHTML = articleObject.comments - newsArticleComments.href = articleObject.commentsLink + newsArticleFeedServerIcon.innerHTML = `icon of feed server` newsArticleContentScrollable.innerHTML = '
' + articleObject.content + '
' Array.from(newsArticleContentScrollable.getElementsByClassName('bbCodeSpoilerButton')).forEach(v => { v.onclick = () => { @@ -1060,71 +1058,71 @@ function displayArticle(articleObject, index){ * Load news information from the RSS feed specified in the * distribution index. */ -async function loadNews(){ +async function loadNews() { - const distroData = await DistroAPI.getDistribution() - if(!distroData.rawDistribution.rss) { - loggerLanding.debug('No RSS feed provided.') - return null + const distroData = await DistroAPI.getDistribution(); + if (!distroData.rawDistribution.rcf) { + loggerLanding.debug('No RCF feed provided.'); + return null; } const promise = new Promise((resolve, reject) => { - - const newsFeed = distroData.rawDistribution.rss - const newsHost = new URL(newsFeed).origin + '/' + + const newsFeed = distroData.rawDistribution.rcf; $.ajax({ url: newsFeed, + dataType: 'json', // Specify that we expect JSON data success: (data) => { - const items = $(data).find('item') - const articles = [] + const feedInfo = data.info; // General feed info + const items = data.feeds; // Content items (array) + const articles = []; + const feed_server_icon_url = data.image.icon; - for(let i=0; i { resolve({ articles: null - }) - }) - }) + }); + }); + }); - return await promise + return await promise; } diff --git a/app/landing.ejs b/app/landing.ejs index b836a5b..4a93416 100644 --- a/app/landing.ejs +++ b/app/landing.ejs @@ -175,17 +175,18 @@ \ No newline at end of file diff --git a/distro.json b/distro.json index fe2b22c..63d12c8 100644 --- a/distro.json +++ b/distro.json @@ -14,7 +14,7 @@ "minimum": 1024 } }, - "rss": "", + "rcf": "https://api.damp11113.xyz/feed/getfeed?page=1&limit=10&service=dmb_mc", "servers": [ { "id": "DMB", diff --git a/electron-builder.yml b/electron-builder.yml index 43a49b8..56b29b6 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -1,5 +1,5 @@ -appId: 'helioslauncher' -productName: 'Helios Launcher' +appId: 'dmblauncher' +productName: 'DMB Launcher' artifactName: '${productName}-setup-${version}.${ext}' copyright: 'Copyright © 2018-2024 Daniel Scalzi' diff --git a/package.json b/package.json index 40af98e..252d17e 100644 --- a/package.json +++ b/package.json @@ -1,18 +1,18 @@ { - "name": "helioslauncher", + "name": "dmblauncher", "version": "2.2.1", - "productName": "Helios Launcher", - "description": "Modded Minecraft Launcher", - "author": "Daniel Scalzi (https://github.com/dscalzi/)", - "license": "UNLICENSED", - "homepage": "https://github.com/dscalzi/HeliosLauncher", + "productName": "DMB Launcher", + "description": "Modded Minecraft Launcher for DMB project", + "author": "Daniel Scalzi (https://github.com/dscalzi/), damp11113", + "license": "UNLICENSED/MIT (Some part of DPSoftware)", + "homepage": "https://damp11113.xyz", "bugs": { "url": "https://github.com/dscalzi/HeliosLauncher/issues" }, "private": true, "main": "index.js", "scripts": { - "start": "electron .", + "dev": "electron .", "dist": "electron-builder build", "dist:win": "npm run dist -- -w", "dist:mac": "npm run dist -- -m", diff --git a/run.bat b/run.bat index a01add9..b896a08 100644 --- a/run.bat +++ b/run.bat @@ -1 +1 @@ -npm run start \ No newline at end of file +npm run dev \ No newline at end of file From f96333069fc908fe2e597313e2ec4e4b102049c5 Mon Sep 17 00:00:00 2001 From: damp11113 Date: Mon, 4 Nov 2024 20:29:13 +0700 Subject: [PATCH 7/7] update something new --- app/app.ejs | 2 +- app/assets/css/launcher.css | 10 + app/assets/js/distromanager.js | 1 + app/assets/js/langloader.js | 1 + app/assets/js/processbuilder.js | 3 +- app/assets/js/scripts/landing.js | 107 +++++- app/assets/js/scripts/overlay.js | 14 +- app/assets/lang/_custom.toml | 4 +- app/assets/lang/en_US.toml | 8 +- app/assets/lang/th_TH.toml | 349 ++++++++++++++++++ app/overlay.ejs | 1 + distro.json | 30 +- docs/new_sample_distribution.json | 71 ++++ docs/newdistro.md | 592 ++++++++++++++++++++++++++++++ index.js | 2 +- package-lock.json | 9 +- package.json | 1 + run.bat | 1 + 18 files changed, 1184 insertions(+), 22 deletions(-) create mode 100644 app/assets/lang/th_TH.toml create mode 100644 docs/new_sample_distribution.json create mode 100644 docs/newdistro.md diff --git a/app/app.ejs b/app/app.ejs index 704f6d6..c237378 100644 --- a/app/app.ejs +++ b/app/app.ejs @@ -1,6 +1,6 @@ - + <%= lang('app.title') %> diff --git a/app/assets/css/launcher.css b/app/assets/css/launcher.css index 58618a4..a19f98a 100644 --- a/app/assets/css/launcher.css +++ b/app/assets/css/launcher.css @@ -3571,6 +3571,16 @@ input:checked + .toggleSwitchSlider:before { -webkit-user-select: initial; } +#overlayDetail { + width: 100%; + height: 100px; /* Adjust height as needed */ + padding: 10px; + font-size: 14px; + border: 1px solid #ccc; + border-radius: 4px; +} + + /* Div which contains action buttons. */ #overlayActionContainer { display: flex; diff --git a/app/assets/js/distromanager.js b/app/assets/js/distromanager.js index 74f755f..7737a30 100644 --- a/app/assets/js/distromanager.js +++ b/app/assets/js/distromanager.js @@ -15,4 +15,5 @@ const api = new DistributionAPI( false ) + exports.DistroAPI = api \ No newline at end of file diff --git a/app/assets/js/langloader.js b/app/assets/js/langloader.js index b1f13c9..eee21ce 100644 --- a/app/assets/js/langloader.js +++ b/app/assets/js/langloader.js @@ -35,6 +35,7 @@ exports.queryEJS = function(id, placeHolders){ exports.setupLanguage = function(){ // Load Language Files exports.loadLanguage('en_US') + //exports.loadLanguage('th_TH') // Uncomment this when translations are ready //exports.loadLanguage('xx_XX') diff --git a/app/assets/js/processbuilder.js b/app/assets/js/processbuilder.js index 82791bd..41ad00e 100644 --- a/app/assets/js/processbuilder.js +++ b/app/assets/js/processbuilder.js @@ -23,7 +23,8 @@ const logger = LoggerUtil.getLogger('ProcessBuilder') */ class ProcessBuilder { - constructor(distroServer, vanillaManifest, modManifest, authUser, launcherVersion){ + constructor(distroServer, vanillaManifest, modManifest, authUser, launcherVersion) { + console.log(distroServer) this.gameDir = path.join(ConfigManager.getInstanceDirectory(), distroServer.rawServer.id) this.commonDir = ConfigManager.getCommonDirectory() this.server = distroServer diff --git a/app/assets/js/scripts/landing.js b/app/assets/js/scripts/landing.js index 990d3b0..06e6772 100644 --- a/app/assets/js/scripts/landing.js +++ b/app/assets/js/scripts/landing.js @@ -1,8 +1,11 @@ -/** +/* * Script for landing.ejs */ // Requirements const axios = require('axios'); +const { exec } = require('child_process'); +const _ = require('lodash'); +const fs = require('fs'); const { URL } = require('url') const { @@ -547,6 +550,44 @@ const GAME_JOINED_REGEX = /\[.+\]: Sound engine started/ const GAME_LAUNCH_REGEX = /^\[.+\]: (?:MinecraftForge .+ Initialized|ModLauncher .+ starting: .+|Loading Minecraft .+ with Fabric Loader .+)$/ const MIN_LINGER = 5000 +function waitForAllow(commandlist) { + const overlayDetail = document.getElementById("overlayDetail"); + overlayDetail.style.display = "block"; // Make the textarea visible + overlayDetail.value = ""; // Clear any existing content + + commandlist.forEach((command) => { + overlayDetail.value += command + "\n"; // Add each command to a new line in the textarea + }); + + setOverlayContent( + Lang.queryJS('landing.pre_command.warningTitle'), + Lang.queryJS('landing.pre_command.warningText'), + Lang.queryJS('landing.pre_command.allow'), + Lang.queryJS('landing.pre_command.deny') + ) + setOverlayHandler(null); + toggleOverlay(true, true, 'overlayContent', true); + toggleLaunchArea(false); + + return new Promise((resolve) => { + const trueButton = document.getElementById('overlayAcknowledge'); + const falseButton = document.getElementById('overlayDismiss'); + + const handleChoice = (choice) => { + resolve(choice); + // Remove event listeners after choice is made + trueButton.removeEventListener('click', handleTrue); + falseButton.removeEventListener('click', handleFalse); + }; + + const handleTrue = () => handleChoice(true); + const handleFalse = () => handleChoice(false); + + trueButton.addEventListener('click', handleTrue); + falseButton.addEventListener('click', handleFalse); + }); +} + async function dlAsync(login = true) { // Login parameter is temporary for debug purposes. Allows testing the validation/downloads without @@ -575,6 +616,70 @@ async function dlAsync(login = true) { return } } + // check if has pre command + + let platform = os.platform() + let allow_pre_command; + + let pre_command = serv?.rawServer?.pre_command?.[platform] + + if (pre_command !== undefined) { + allow_pre_command = await waitForAllow(pre_command); + toggleOverlay(false) + } else { + allow_pre_command = false; + } + + console.log(allow_pre_command); + + if (allow_pre_command) { + // Initialize an array to hold the compiled commands + const commandsToExecute = []; + + if (platform === "win32") { + commandsToExecute.push("@echo off"); + } + + pre_command.forEach((commandTemplate) => { + // Compile the command template + const compiled = _.template(commandTemplate); + console.log(ConfigManager.launcherDir); + const command = compiled({ launcherDir: ConfigManager.getLauncherDirectory() }); + + // Push the compiled command to the array + commandsToExecute.push(command); + }); + + commandsToExecute.push("exit"); + + // Define a temporary file path + let tempFilePath; + if (platform === "win32") { + tempFilePath = path.join(os.tmpdir(), 'temp_command.bat'); // Windows batch file + } else { + tempFilePath = path.join(os.tmpdir(), 'temp_command.sh'); // Unix shell script + } + + // Create the command file and write all commands into it + fs.writeFileSync(tempFilePath, commandsToExecute.join('\n')); + + // Make the file executable on Unix-based systems + if (platform === 'linux' || platform === 'darwin') { + execSync(`chmod +x ${tempFilePath}`); + } + + // Execute the temporary command file based on the OS + if (platform === 'win32') { + exec(`start cmd.exe /k "${tempFilePath}"`, { stdio: 'inherit' }); + } else if (platform === 'darwin') { + exec(`open -a Terminal "${tempFilePath}"`, { stdio: 'inherit' }); + } else if (platform === 'linux') { + exec(`xterm -e "${tempFilePath}"`, { stdio: 'inherit' }); + } + + // Optionally, delete the temporary file after execution + // fs.unlinkSync(tempFilePath); + } setLaunchDetails(Lang.queryJS('landing.dlAsync.pleaseWait')) toggleLaunchArea(true) diff --git a/app/assets/js/scripts/overlay.js b/app/assets/js/scripts/overlay.js index 0d6ab2a..9625a94 100644 --- a/app/assets/js/scripts/overlay.js +++ b/app/assets/js/scripts/overlay.js @@ -65,7 +65,7 @@ function bindOverlayKeys(state, content, dismissable){ * @param {boolean} dismissable Optional. True to show the dismiss option, otherwise false. * @param {string} content Optional. The content div to be shown. */ -function toggleOverlay(toggleState, dismissable = false, content = 'overlayContent'){ +function toggleOverlay(toggleState, dismissable = false, content = 'overlayContent', disdetail=false){ if(toggleState == null){ toggleState = !document.getElementById('main').hasAttribute('overlay') } @@ -85,6 +85,12 @@ function toggleOverlay(toggleState, dismissable = false, content = 'overlayConte } else { $('#overlayDismiss').hide() } + if(disdetail){ + $('#overlayDetail').show() + } else { + $('#overlayDetail').hide() + } + $('#overlayContainer').fadeIn({ duration: 250, start: () => { @@ -112,6 +118,12 @@ function toggleOverlay(toggleState, dismissable = false, content = 'overlayConte } else { $('#overlayDismiss').hide() } + + if(disdetail){ + $('#overlayDetail').show() + } else { + $('#overlayDetail').hide() + } } }) } diff --git a/app/assets/lang/_custom.toml b/app/assets/lang/_custom.toml index 4bc8510..e820c0f 100644 --- a/app/assets/lang/_custom.toml +++ b/app/assets/lang/_custom.toml @@ -4,11 +4,11 @@ title = "DMB" [ejs.landing] -mediaGitHubURL = "https://git.damp11113.xyz/Mirror/unknow-dmb" +mediaGitHubURL = "https://damp11113.xyz/" mediaTwitterURL = "#" mediaInstagramURL = "#" mediaYouTubeURL = "#" -mediaDiscordURL = "https://discord.gg/zNWUXdt" +mediaDiscordURL = "#" [ejs.settings] sourceGithubLink = "https://git.damp11113.xyz/Mirror/unknow-dmb" diff --git a/app/assets/lang/en_US.toml b/app/assets/lang/en_US.toml index 06d556f..d01e830 100644 --- a/app/assets/lang/en_US.toml +++ b/app/assets/lang/en_US.toml @@ -155,9 +155,15 @@ desc = "An unknown error has occurred. Please see the console for details." [js.landing.launch] pleaseWait = "Please wait.." failureTitle = "Error During Launch" -failureText = "See console (CTRL + Shift + i) for more details." +failureText = "Please contact to support at damp11113.xyz/support" okay = "Okay" +[js.landing.pre_command] +warningTitle = "Warning: Command Execution Required" +warningText = "Please ensure that the command you are about to execute is safe and expected. Unrecognized commands may pose a security risk." +allow = "Allow" +deny = "Deny" + [js.landing.selectedAccount] noAccountSelected = "No Account Selected" diff --git a/app/assets/lang/th_TH.toml b/app/assets/lang/th_TH.toml new file mode 100644 index 0000000..13d7bfe --- /dev/null +++ b/app/assets/lang/th_TH.toml @@ -0,0 +1,349 @@ +[ejs.landing] +updateAvailableTooltip = "มีการอัปเดต" +usernamePlaceholder = "ชื่อผู้ใช้" +usernameEditButton = "แก้ไข" +settingsTooltip = "การตั้งค่า" +serverStatus = "สถานะเซิร์ฟเวอร์" +serverStatusPlaceholder = "ออฟไลน์" +mojangStatus = "สถานะ MOJANG" +mojangStatusTooltipTitle = "บริการ" +mojangStatusNETitle = "ไม่ สำคัญ" +newsButton = "ข่าว" +launchButton = "เล่น" +launchButtonPlaceholder = "• ไม่มีเซิร์ฟเวอร์ที่เลือก" +launchDetails = "กรุณารอ.." +newsNavigationStatus = "{currentPage} จาก {totalPages}" +newsErrorLoadSpan = "กำลังตรวจสอบข่าว.." +newsErrorFailedSpan = "ไม่สามารถโหลดข่าวได้" +newsErrorRetryButton = "ลองอีกครั้ง" +newsErrorNoneSpan = "ไม่มีข่าว" + +[ejs.login] +loginCancelText = "ยกเลิก" +loginSubheader = "DPCloudev LOGIN" +loginEmailError = "* ค่าที่ไม่ถูกต้อง" +loginEmailPlaceholder = "ชื่อผู้ใช้" +loginPasswordError = "* จำเป็น" +loginPasswordPlaceholder = "รหัสผ่าน" +loginForgotPasswordLink = "https://dashboard.damp11113.xyz/forgotpw" +loginForgotPasswordText = "ลืมรหัสผ่าน?" +loginRememberMeText = "จำฉันไว้?" +loginButtonText = "เข้าสู่ระบบ" +loginNeedAccountLink = "https://dashboard.damp11113.xyz/register" +loginNeedAccountText = "ต้องการบัญชี?" +loginPasswordDisclaimer1 = "รหัสผ่านของคุณจะถูกส่งไปยัง DPCloudev โดยตรงและไม่ถูกเก็บไว้." +loginPasswordDisclaimer2 = "{appName} ไม่มีความเกี่ยวข้องกับ Mojang AB." + +[ejs.loginOptions] +loginOptionsTitle = "ตัวเลือกการเข้าสู่ระบบ" +loginWithMicrosoft = "เข้าสู่ระบบด้วย Microsoft" +loginWithDPCloudev = "เข้าสู่ระบบด้วย DPCloudev (ผู้ใช้ฟรี)" +cancelButton = "ยกเลิก" + +[ejs.overlay] +serverSelectHeader = "เซิร์ฟเวอร์ที่มีอยู่" +serverSelectConfirm = "เลือก" +serverSelectCancel = "ยกเลิก" +accountSelectHeader = "เลือกบัญชี" +accountSelectConfirm = "เลือก" +accountSelectCancel = "ยกเลิก" + +[ejs.settings] +navHeaderText = "การตั้งค่า" +navAccount = "บัญชี" +navMinecraft = "Minecraft" +navMods = "มอด" +navJava = "Java" +navLauncher = "ตัวโหลด" +navAbout = "เกี่ยวกับ" +navUpdates = "การอัปเดต" +navDone = "เสร็จสิ้น" +tabAccountHeaderText = "การตั้งค่าบัญชี" +tabAccountHeaderDesc = "เพิ่มบัญชีใหม่หรือจัดการบัญชีที่มีอยู่." +microsoftAccount = "Microsoft" +addMicrosoftAccount = "+ เพิ่มบัญชี Microsoft" +DPCloudevAccount = "DPCloudev" +addDPCloudevAccount = "+ เพิ่มบัญชี DPCloudev" +minecraftTabHeaderText = "การตั้งค่า Minecraft" +minecraftTabHeaderDesc = "ตัวเลือกที่เกี่ยวข้องกับการเปิดเกม." +gameResolutionTitle = "ความละเอียดเกม" +launchFullscreenTitle = "เปิดในโหมดเต็มหน้าจอ." +autoConnectTitle = "เชื่อมต่อกับเซิร์ฟเวอร์โดยอัตโนมัติเมื่อเปิดเกม." +launchDetachedTitle = "เปิดเกมแยกจากตัวโหลด." +launchDetachedDesc = "หากเกมไม่แยก การปิดตัวโหลดจะปิดเกมด้วย." +tabModsHeaderText = "การตั้งค่ามอด" +tabModsHeaderDesc = "เปิดหรือปิดมอด." +switchServerButton = "สลับ" +requiredMods = "มอดที่จำเป็น" +optionalMods = "มอดที่ไม่จำเป็น" +dropinMods = "มอดที่ใส่ได้" +addMods = "เพิ่มมอด" +dropinRefreshNote = "(F5 เพื่อรีเฟรช)" +shaderpacks = "แพ็คเชเดอร์" +shaderpackDesc = "เปิดหรือปิดการใช้เชเดอร์ โปรดทราบว่าการใช้เชเดอร์จะทำงานได้ดีเฉพาะบนการตั้งค่าที่มีประสิทธิภาพสูง คุณสามารถเพิ่มแพ็คที่กำหนดเองที่นี่." +selectShaderpack = "เลือกแพ็คเชเดอร์" +tabJavaHeaderText = "การตั้งค่า Java" +tabJavaHeaderDesc = "จัดการการกำหนดค่าของ Java (ขั้นสูง)." +memoryTitle = "หน่วยความจำ" +maxRAM = "RAM สูงสุด" +minRAM = "RAM ขั้นต่ำ" +memoryDesc = "RAM ขั้นต่ำที่แนะนำคือ 3 กิกะไบต์ การตั้งค่าให้มีค่าเท่ากันสำหรับค่าขั้นต่ำและสูงสุดอาจทำให้เกิดการหน่วง." +memoryTotalTitle = "ทั้งหมด" +memoryAvailableTitle = "ที่มีอยู่" +javaExecutableTitle = "ไฟล์ปฏิบัติการ Java" +javaExecSelDialogTitle = "เลือกไฟล์ปฏิบัติการ Java" +javaExecSelButtonText = "เลือกไฟล์" +javaExecDesc = "ไฟล์ปฏิบัติการ Java จะถูกตรวจสอบก่อนเปิดเกม." +javaPathDesc = "เส้นทางควรสิ้นสุดด้วย {pathSuffix}." +jvmOptsTitle = "ตัวเลือก JVM เพิ่มเติม" +jvmOptsDesc = "ตัวเลือกที่จะถูกส่งให้กับ JVM ในขณะทำงาน -Xms และ -Xmx ไม่ควรรวมอยู่ด้วย." +launcherTabHeaderText = "การตั้งค่าตัวโหลด" +launcherTabHeaderDesc = "ตัวเลือกที่เกี่ยวข้องกับตัวโหลดเอง." +allowPrereleaseTitle = "อนุญาตการอัปเดตเวอร์ชันทดสอบ." +allowPrereleaseDesc = "เวอร์ชันทดสอบรวมฟีเจอร์ใหม่ที่อาจยังไม่ได้ทดสอบหรือรวมเข้าด้วยกัน.
สิ่งนี้จะเป็นจริงเสมอหากคุณใช้เวอร์ชันทดสอบ." +dataDirectoryTitle = "ไดเรกทอรีข้อมูล" +selectDataDirectory = "เลือกไดเรกทอรีข้อมูล" +chooseFolder = "เลือกโฟลเดอร์" +dataDirectoryDesc = "ไฟล์เกมและการติดตั้ง Java ในท้องถิ่นทั้งหมดจะถูกเก็บไว้ในไดเรกทอรีข้อมูล.
ภาพหน้าจอและการบันทึกโลกจะถูกเก็บไว้ในโฟลเดอร์อินสแตนซ์สำหรับการกำหนดค่าเซิร์ฟเวอร์ที่เกี่ยวข้อง." +aboutTabHeaderText = "เกี่ยวกับ" +aboutTabHeaderDesc = "ดูข้อมูลและบันทึกการปล่อยสำหรับเวอร์ชันปัจจุบัน." +aboutTitle = "{appName}" +stableRelease = "การปล่อยที่เสถียร" +versionText = "เวอร์ชัน " +sourceGithub = "แหล่งที่มา (GitHub)" +support = "สนับสนุน" +devToolsConsole = "คอนโซล DevTools" +releaseNotes = "บันทึกการปล่อย" +changelog = "การเปลี่ยนแปลง" +noReleaseNotes = "ไม่มีบันทึกการปล่อย" +viewReleaseNotes = "ดูบันทึกการปล่อยบน GitHub" +launcherUpdatesHeaderText = "การอัปเดตตัวโหลด" +launcherUpdatesHeaderDesc = "ดาวน์โหลด ติดตั้ง และตรวจสอบการอัปเดตสำหรับตัวโหลด." +checkForUpdates = "ตรวจสอบการอัปเดต" +whatsNew = "มีอะไรใหม่" +updateReleaseNotes = "บันทึกการปล่อยการอัปเดต" + +[ejs.waiting] +waitingText = "รอ Microsoft.." + +[ejs.welcome] +continueButton = "ดำเนินการต่อ" + +[js.discord] +waiting = "รอ Client.." +state = "เซิร์ฟเวอร์: {shortId}" + +[js.index] +microsoftLoginTitle = "เข้าสู่ระบบ Microsoft" +microsoftLogoutTitle = "ออกจากระบบ Microsoft" + +[js.login] +login = "เข้าสู่ระบบ" +loggingIn = "กำลังเข้าสู่ระบบ" +success = "สำเร็จ" +tryAgain = "ลองอีกครั้ง" + +[js.login.error] +invalidValue = "* ค่าที่ไม่ถูกต้อง" +requiredValue = "* ต้องระบุ" + +[js.login.error.unknown] +title = "ข้อผิดพลาดที่ไม่ทราบระหว่างการเข้าสู่ระบบ" +desc = "เกิดข้อผิดพลาดที่ไม่ทราบ สอบถามรายละเอียดในคอนโซล" + +[js.landing.launch] +pleaseWait = "กรุณารอสักครู่.." +failureTitle = "ข้อผิดพลาดระหว่างการเปิด" +failureText = "ดูคอนโซล (CTRL + Shift + i) เพื่อดูรายละเอียดเพิ่มเติม" +okay = "ตกลง" + +[js.landing.pre_command] +warningTitle = "คำเตือน: ต้องดำเนินการคำสั่ง" +warningText = "โปรดตรวจสอบให้แน่ใจว่าคำสั่งที่คุณกำลังจะดำเนินการนั้นปลอดภัยและเป็นที่คาดหวัง คำสั่งที่ไม่รู้จักอาจก่อให้เกิดความเสี่ยงด้านความปลอดภัย" +allow = "อนุญาต" +deny = "ปฏิเสธ" + +[js.landing.selectedAccount] +noAccountSelected = "ยังไม่มีบัญชีที่เลือก" + +[js.landing.selectedServer] +noSelection = "ยังไม่มีเซิร์ฟเวอร์ที่เลือก" +loading = "กำลังโหลด.." + +[js.landing.serverStatus] +server = "เซิร์ฟเวอร์" +offline = "ออฟไลน์" +players = "ผู้เล่น" + +[js.landing.systemScan] +checking = "กำลังตรวจสอบข้อมูลระบบ.." +noCompatibleJava = "ไม่พบ
การติดตั้ง Java ที่เข้ากันได้" +installJavaMessage = "ในการเปิด Minecraft คุณต้องมีการติดตั้ง Java 64-bit เวอร์ชัน {major} คุณต้องการให้เราติดตั้งสำเนาไหม?" +installJava = "ติดตั้ง Java" +installJavaManually = "ติดตั้งด้วยตนเอง" +javaDownloadPrepare = "กำลังเตรียมการดาวน์โหลด Java.." +javaDownloadFailureTitle = "ข้อผิดพลาดระหว่างดาวน์โหลด Java" +javaDownloadFailureText = "ดูคอนโซล (CTRL + Shift + i) เพื่อดูรายละเอียดเพิ่มเติม" +javaRequired = "Java จำเป็น
ในการเปิด" +javaRequiredMessage = 'การติดตั้ง x64 ของ Java {major} ที่ถูกต้องจำเป็นในการเปิด

โปรดดู คู่มือการจัดการ Java ของเราสำหรับคำแนะนำเกี่ยวกับการติดตั้ง Java ด้วยตนเอง' +javaRequiredDismiss = "ฉันเข้าใจ" +javaRequiredCancel = "กลับไป" + +[js.landing.downloadJava] +findJdkFailure = "ไม่สามารถค้นหา OpenJDK distribution ได้" +javaDownloadCorruptedError = "JDK ที่ดาวน์โหลดมีแฮชไม่ถูกต้อง ไฟล์อาจเสียหาย" +extractingJava = "กำลังแตกไฟล์ Java" +javaInstalled = "ติดตั้ง Java เสร็จสิ้น!" + +[js.landing.dlAsync] +loadingServerInfo = "กำลังโหลดข้อมูลเซิร์ฟเวอร์.." +fatalError = "ข้อผิดพลาดร้ายแรง" +unableToLoadDistributionIndex = "ไม่สามารถโหลดสำเนาของดัชนีการจัดจำหน่ายได้ ดูในคอนโซล (CTRL + Shift + i) สำหรับรายละเอียดเพิ่มเติม" +pleaseWait = "กรุณารอสักครู่.." +errorDuringLaunchTitle = "ข้อผิดพลาดระหว่างการเปิด" +seeConsoleForDetails = "ดูคอนโซล (CTRL + Shift + i) สำหรับรายละเอียดเพิ่มเติม" +validatingFileIntegrity = "กำลังตรวจสอบความสมบูรณ์ของไฟล์.." +errorDuringFileVerificationTitle = "ข้อผิดพลาดระหว่างการตรวจสอบไฟล์" +downloadingFiles = "กำลังดาวน์โหลดไฟล์.." +errorDuringFileDownloadTitle = "ข้อผิดพลาดระหว่างดาวน์โหลดไฟล์" +preparingToLaunch = "กำลังเตรียมเปิด.." +launchingGame = "กำลังเปิดเกม.." +launchWrapperNotDownloaded = "ไฟล์หลัก, LaunchWrapper ไม่สามารถดาวน์โหลดได้อย่างถูกต้อง ทำให้เกมไม่สามารถเปิดได้

เพื่อแก้ไขปัญหานี้ โปรดปิดซอฟต์แวร์ป้องกันไวรัสของคุณชั่วคราวและลองเปิดเกมอีกครั้ง

หากคุณมีเวลา กรุณา ส่งปัญหา และบอกให้เราทราบว่าคุณใช้ซอฟต์แวร์ป้องกันไวรัสอะไร เราจะติดต่อพวกเขาและพยายามแก้ไขปัญหานี้" +doneEnjoyServer = "เสร็จสิ้น สนุกกับเซิร์ฟเวอร์!" +checkConsoleForDetails = "โปรดตรวจสอบคอนโซล (CTRL + Shift + i) สำหรับรายละเอียดเพิ่มเติม" + +[js.landing.news] +checking = "กำลังตรวจสอบข่าวสาร" + +[js.landing.discord] +loading = "กำลังโหลดเกม.." +joining = "กำลังเดินทางไป Westeros!" +joined = "สำรวจดินแดน!" + +[js.overlay] +dismiss = "ปิด" + +[js.settings.fileSelectors] +executables = "ไฟล์ที่สามารถเรียกใช้งาน" +allFiles = "ไฟล์ทั้งหมด" + +[js.settings.mstfLogin] +errorTitle = "เกิดอะไรผิดพลาด" +errorMessage = "การตรวจสอบสิทธิ์ Microsoft ล้มเหลว โปรดลองอีกครั้ง" +okButton = "ตกลง" + +[js.settings.mstfLogout] +errorTitle = "เกิดอะไรผิดพลาด" +errorMessage = "การออกจากระบบ Microsoft ล้มเหลว โปรดลองอีกครั้ง" +okButton = "ตกลง" + +[js.settings.authAccountSelect] +selectButton = "เลือกบัญชี" +selectedButton = "บัญชีที่เลือก ✔" + +[js.settings.authAccountLogout] +lastAccountWarningTitle = "คำเตือน
นี่คือบัญชีสุดท้ายของคุณ" +lastAccountWarningMessage = "ในการใช้ตัวเรียกใช้งาน คุณต้องเข้าสู่ระบบบัญชีอย่างน้อยหนึ่งบัญชี คุณจะต้องเข้าสู่ระบบอีกครั้งหลังจากนี้

คุณแน่ใจหรือไม่ว่าต้องการออกจากระบบ?" +confirmButton = "ฉันแน่ใจ" +cancelButton = "ยกเลิก" + +[js.settings.authAccountPopulate] +username = "ชื่อผู้ใช้" +uuid = "UUID" +selectAccount = "เลือกบัญชี" +selectedAccount = "บัญชีที่เลือก ✓" +logout = "ออกจากระบบ" + +[js.settings.dropinMods] +removeButton = "ลบ" +deleteFailedTitle = "ไม่สามารถลบ
Drop-in Mod {fullName}" +deleteFailedMessage = "โปรดตรวจสอบว่าไฟล์ไม่ถูกใช้งานอยู่และลองอีกครั้ง" +failedToggleTitle = "ไม่สามารถเปลี่ยนสถานะ
Drop-in Mods หนึ่งหรือหลายรายการ" +okButton = "ตกลง" + +[js.settings.serverListing] +mainServer = "เซิร์ฟเวอร์หลัก" + +[js.settings.java] +selectedJava = "เลือกแล้ว: Java {version} ({vendor})" +invalidSelection = "การเลือกไม่ถูกต้อง" +requiresJava = "ต้องการ Java {major} x64." +availableOptions = "ตัวเลือกที่มีให้สำหรับ Java {major} (HotSpot VM)" + +[js.settings.about] +preReleaseTitle = "เวอร์ชันพรีรีลีส" +stableReleaseTitle = "เวอร์ชันเสถียร" +releaseNotesFailed = "ไม่สามารถโหลดบันทึกการปล่อยได้" + +[js.settings.updates] +newReleaseTitle = "มีเวอร์ชันใหม่" +newPreReleaseTitle = "มีเวอร์ชันพรีรีลีสใหม่" +downloadingButton = "กำลังดาวน์โหลด.." +downloadButton = 'ดาวน์โหลดจาก GitHubปิดตัวเรียกใช้งานและเรียกใช้ dmg เพื่ออัปเดต' +latestVersionTitle = "คุณกำลังใช้เวอร์ชันล่าสุด" +checkForUpdatesButton = "ตรวจสอบการอัปเดต" +checkingForUpdatesButton = "กำลังตรวจสอบการอัปเดต.." + +[js.settings.msftLogin] +errorTitle = "การเข้าสู่ระบบ Microsoft ล้มเหลว" +errorMessage = "ไม่สามารถตรวจสอบบัญชี Microsoft ของคุณ โปรดลองอีกครั้ง" +okButton = "ตกลง" + +[js.uibinder.startup] +fatalErrorTitle = "ข้อผิดพลาดร้ายแรง: ไม่สามารถโหลดดัชนีการจัดจำหน่าย" +fatalErrorMessage = "ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์เพื่อดาวน์โหลดดัชนีการจัดจำหน่ายได้ ไม่มีสำเนาในเครื่องให้โหลด

ดัชนีการจัดจำหน่ายเป็นไฟล์ที่จำเป็นซึ่งให้ข้อมูลเซิร์ฟเวอร์ล่าสุด ตัวเรียกใช้งานไม่สามารถเริ่มต้นได้หากไม่มีมัน โปรดตรวจสอบว่าคุณเชื่อมต่อกับอินเทอร์เน็ตและลองเปิดแอปพลิเคชันอีกครั้ง" +closeButton = "ปิด" + +[js.uibinder.validateAccount] +failedMessageTitle = "ไม่สามารถรีเฟรชการเข้าสู่ระบบ" +failedMessage = "ไม่สามารถรีเฟรชการเข้าสู่ระบบสำหรับ {account} ได้ โปรดเลือกบัญชีอื่นหรือเข้าสู่ระบบอีกครั้ง." +failedMessageSelectAnotherAccount = "ไม่สามารถรีเฟรชการเข้าสู่ระบบสำหรับ {account} ได้ โปรดเข้าสู่ระบบอีกครั้ง." +loginButton = "เข้าสู่ระบบ" +selectAnotherAccountButton = "เลือกบัญชีอื่น" + +[js.uicore.autoUpdate] +checkingForUpdateButton = "กำลังตรวจสอบการอัปเดต..." +installNowButton = "ติดตั้งตอนนี้" +checkForUpdatesButton = "ตรวจสอบการอัปเดต" + +[js.auth.microsoft.error] +noProfileTitle = "ข้อผิดพลาดระหว่างการเข้าสู่ระบบ:
โปรไฟล์ยังไม่ได้ตั้งค่า" +noProfileDesc = "บัญชี Microsoft ของคุณยังไม่ได้ตั้งค่าโปรไฟล์ Minecraft หากคุณเพิ่งซื้อเกมหรือแลกผ่าน Xbox Game Pass คุณต้องตั้งค่าโปรไฟล์ของคุณที่ Minecraft.net.

หากคุณยังไม่ได้ซื้อเกม คุณสามารถซื้อได้ที่ Minecraft.net." +noXboxAccountTitle = "ข้อผิดพลาดระหว่างการเข้าสู่ระบบ:
ไม่มีบัญชี Xbox" +noXboxAccountDesc = "บัญชี Microsoft ของคุณไม่มีบัญชี Xbox ที่เกี่ยวข้อง." +xblBannedTitle = "ข้อผิดพลาดระหว่างการเข้าสู่ระบบ:
Xbox Live ไม่สามารถใช้งานได้" +xblBannedDesc = "บัญชี Microsoft ของคุณมาจากประเทศที่ Xbox Live ไม่สามารถใช้งานได้หรือถูกแบน." +under18Title = "ข้อผิดพลาดระหว่างการเข้าสู่ระบบ:
ต้องการการอนุมัติจากผู้ปกครอง" +under18Desc = "บัญชีสำหรับผู้ใช้ที่อายุต่ำกว่า 18 ปีต้องถูกเพิ่มเข้าครอบครัวโดยผู้ใหญ่." +unknownTitle = "ข้อผิดพลาดที่ไม่ทราบระหว่างการเข้าสู่ระบบ" +unknownDesc = "เกิดข้อผิดพลาดที่ไม่ทราบ กรุณาดูในคอนโซลสำหรับรายละเอียด." + +[js.auth.mojang.error] +methodNotAllowedTitle = "ข้อผิดพลาดภายใน:
ไม่อนุญาตวิธีการ" +methodNotAllowedDesc = "ไม่อนุญาตวิธีการ กรุณารายงานข้อผิดพลาดนี้." +notFoundTitle = "ข้อผิดพลาดภายใน:
ไม่พบ" +notFoundDesc = "ไม่พบจุดสิ้นสุดการตรวจสอบสิทธิ์ กรุณารายงานปัญหานี้." +accountMigratedTitle = "ข้อผิดพลาดระหว่างการเข้าสู่ระบบ:
บัญชีได้ถูกโยกย้าย" +accountMigratedDesc = "คุณได้พยายามเข้าสู่ระบบด้วยบัญชีที่โยกย้ายแล้ว ลองอีกครั้งโดยใช้ที่อยู่อีเมลบัญชีเป็นชื่อผู้ใช้." +invalidCredentialsTitle = "ข้อผิดพลาดระหว่างการเข้าสู่ระบบ:
ข้อมูลรับรองไม่ถูกต้อง" +invalidCredentialsDesc = "อีเมลหรือรหัสผ่านที่คุณป้อนไม่ถูกต้อง กรุณาลองอีกครั้ง." +tooManyAttemptsTitle = "ข้อผิดพลาดระหว่างการเข้าสู่ระบบ:
พยายามเข้าสู่ระบบมากเกินไป" +tooManyAttemptsDesc = "มีการพยายามเข้าสู่ระบบมากเกินไปด้วยบัญชีนี้ในช่วงเวลาที่ผ่านมา กรุณาลองอีกครั้งในภายหลัง." +invalidTokenTitle = "ข้อผิดพลาดระหว่างการเข้าสู่ระบบ:
โทเค็นไม่ถูกต้อง" +invalidTokenDesc = "โทเค็นการเข้าถึงที่ให้มานั้นไม่ถูกต้อง." +tokenHasProfileTitle = "ข้อผิดพลาดระหว่างการเข้าสู่ระบบ:
โทเค็นมีโปรไฟล์" +tokenHasProfileDesc = "โทเค็นการเข้าถึงมีโปรไฟล์ที่กำหนดแล้ว การเลือกโปรไฟล์ยังไม่ได้รับการนำเสนอ." +credentialsMissingTitle = "ข้อผิดพลาดระหว่างการเข้าสู่ระบบ:
ข้อมูลรับรองหาย" +credentialsMissingDesc = "ชื่อผู้ใช้/รหัสผ่านไม่ได้ถูกส่งหรือรหัสผ่านมีความยาวน้อยกว่า 3 ตัวอักษร." +invalidSaltVersionTitle = "ข้อผิดพลาดระหว่างการเข้าสู่ระบบ:
เวอร์ชันเกลือไม่ถูกต้อง" +invalidSaltVersionDesc = "เวอร์ชันเกลือไม่ถูกต้อง." +unsupportedMediaTypeTitle = "ข้อผิดพลาดภายใน:
ประเภทสื่อที่ไม่สนับสนุน" +unsupportedMediaTypeDesc = "ประเภทสื่อที่ไม่สนับสนุน กรุณารายงานข้อผิดพลาดนี้." +accountGoneTitle = "ข้อผิดพลาดระหว่างการเข้าสู่ระบบ:
บัญชีได้ถูกโยกย้าย" +accountGoneDesc = "บัญชีได้ถูกโยกย้ายไปยังบัญชี Microsoft กรุณาเข้าสู่ระบบด้วย Microsoft." +unreachableTitle = "ข้อผิดพลาดระหว่างการเข้าสู่ระบบ:
ไม่สามารถเข้าถึงได้" +unreachableDesc = "ไม่สามารถเข้าถึงเซิร์ฟเวอร์ตรวจสอบสิทธิ์ได้ โปรดตรวจสอบให้แน่ใจว่าพวกเขาออนไลน์และคุณเชื่อมต่อกับอินเทอร์เน็ต." +gameNotPurchasedTitle = "ข้อผิดพลาดระหว่างการเข้าสู่ระบบ:
เกมยังไม่ได้ซื้อ" +gameNotPurchasedDesc = "บัญชีที่คุณพยายามเข้าสู่ระบบยังไม่ได้ซื้อสำเนาของ Minecraft คุณสามารถซื้อสำเนาได้ที่ Minecraft.net" +unknownErrorTitle = "ข้อผิดพลาดที่ไม่ทราบระหว่างการเข้าสู่ระบบ" +unknownErrorDesc = "เกิดข้อผิดพลาดที่ไม่ทราบ กรุณาดูในคอนโซลสำหรับรายละเอียด." diff --git a/app/overlay.ejs b/app/overlay.ejs index 7faab15..0ee91bf 100644 --- a/app/overlay.ejs +++ b/app/overlay.ejs @@ -30,6 +30,7 @@
Lorem Ipsum:
Finis Illud Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud.. +
diff --git a/distro.json b/distro.json index 63d12c8..e3c3d66 100644 --- a/distro.json +++ b/distro.json @@ -31,17 +31,29 @@ }, "mainServer": true, "autoconnect": true, - "modules": [ - - ] + "modules": [] }, { "id": "dpg-milsim", - "name": "DPGame something...", - "description": "DPCloudev x DPGame (look at id in distro.json)", + "name": "DPGame milsim", + "description": "Noting just test!", "icon": "", "version": "1.0", - "address": "localhost", + "address": "localhost:25505", + "pre_command": { + "win32": [ + "powershell -Command \"if (-not (Test-Path '<%= launcherDir %>\\cloudflared.exe')) { Invoke-WebRequest -Uri https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-windows-amd64.exe -OutFile '<%= launcherDir %>\\cloudflared.exe' }\"", + "\"<%= launcherDir %>\\cloudflared.exe\" access tcp --hostname minecraft.damp11113.xyz --url localhost:25505" + ], + "darwin": [ + "if [ ! -f /usr/local/bin/cloudflared ]; then brew install cloudflare/cloudflare/cloudflared; fi", + "cloudflared access tcp --hostname minecraft.damp11113.xyz --url localhost:25505" + ], + "linux": [ + "if [ ! -f '<%= launcherDir %>/cloudflared' ]; then wget https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64 -O '<%= launcherDir %>/cloudflared'; chmod +x '<%= launcherDir %>/tools/cloudflared'; fi", + "<%= launcherDir %>/cloudflared access tcp --hostname minecraft.damp11113.xyz --url localhost:25505" + ] + }, "minecraftVersion": "1.20.1", "discord": { "shortId": "Test", @@ -50,9 +62,7 @@ }, "mainServer": true, "autoconnect": true, - "modules": [ - - ] + "modules": [] } ] -} \ No newline at end of file +} diff --git a/docs/new_sample_distribution.json b/docs/new_sample_distribution.json new file mode 100644 index 0000000..77e1753 --- /dev/null +++ b/docs/new_sample_distribution.json @@ -0,0 +1,71 @@ +{ + "version": "1.0.0", + "discord": { + "clientId": "1290669565231108106", + "smallImageText": "", + "smallImageKey": "" + }, + "java": { + "adoptium": "https://adoptium.net/temurin/releases/?package=jdk&version=18", + "supported": ">=17", + "suggestedMajor": 18, + "ram": { + "recommended": 2048, + "minimum": 1024 + } + }, + "rcf": "https://api.damp11113.xyz/feed/getfeed?page=1&limit=10&service=dmb_mc", + "servers": [ + { + "id": "DMB", + "name": "DMB Server", + "description": "A best mc roleplay in Thailand", + "icon": "", + "version": "1.0", + "address": "localhost", + "minecraftVersion": "1.20.1", + "discord": { + "shortId": "Test", + "largeImageText": "", + "largeImageKey": "" + }, + "mainServer": true, + "autoconnect": true, + "modules": [] + }, + { + "id": "dpg-milsim", + "name": "DPGame milsim", + "description": "Noting just test!", + "icon": "", + "version": "1.0", + "address": "localhost:25505", + "pre_command": { + "windows": [ + "powershell -Command \"Invoke-WebRequest -Uri https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-windows-amd64.exe -OutFile cloudflared.exe\"", + "move cloudflared.exe \"C:\\Program Files\\Cloudflare\\cloudflared.exe\"", + "C:\\Program Files\\Cloudflare\\cloudflared.exe access tcp --hostname mcmilsim.damp11113.xyz --url localhost:25505" + ], + "mac": [ + "brew install cloudflare/cloudflare/cloudflared", + "cloudflared access tcp --hostname mcmilsim.damp11113.xyz --url localhost:25505" + ], + "linux": [ + "wget https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64", + "chmod +x cloudflared-linux-amd64", + "sudo mv cloudflared-linux-amd64 /usr/local/bin/cloudflared", + "cloudflared access tcp --hostname mcmilsim.damp11113.xyz --url localhost:25505" + ] + }, + "minecraftVersion": "1.20.1", + "discord": { + "shortId": "Test", + "largeImageText": "", + "largeImageKey": "" + }, + "mainServer": true, + "autoconnect": true, + "modules": [] + } + ] +} diff --git a/docs/newdistro.md b/docs/newdistro.md new file mode 100644 index 0000000..a0efbcf --- /dev/null +++ b/docs/newdistro.md @@ -0,0 +1,592 @@ +# Distribution Index + +You can use [Nebula](https://github.com/dscalzi/Nebula) to automate the generation of a distribution index. + +The most up to date and accurate descriptions of the distribution spec can be viewed in [helios-distribution-types](https://github.com/dscalzi/helios-distribution-types). + +The distribution index is written in JSON. The general format of the index is as posted below. + +```json +{ + "version": "1.0.0", + "discord": { + "clientId": "12334567890123456789", + "smallImageText": "WesterosCraft", + "smallImageKey": "seal-circle" + }, + "ref": "https://api.damp11113.xyz/feed/getfeed?page=1&limit=10&service=dmb_mc", + "servers": [ + { + "id": "Example_Server", + "name": "WesterosCraft Example Client", + "description": "Example WesterosCraft server. Connect for fun!", + "icon": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/example_icon.png", + "version": "0.0.1", + "address": "mc.westeroscraft.com:1337", + "minecraftVersion": "1.11.2", + "discord": { + "shortId": "Example", + "largeImageText": "WesterosCraft Example Server", + "largeImageKey": "server-example" + }, + "mainServer": true, + "autoconnect": true, + "modules": [ + "Module Objects Here" + ] + } + ] +} +``` + +## Distro Index Object + +#### Example +```JSON +{ + "version": "1.0.0", + "discord": { + "clientId": "12334567890123456789", + "smallImageText": "WesterosCraft", + "smallImageKey": "seal-circle" + }, + "rcf": "https://api.damp11113.xyz/feed/getfeed?page=1&limit=10&service=dmb_mc", + "servers": [] +} +``` + +### `DistroIndex.version: string/semver` + +The version of the index format. Will be used in the future to gracefully push updates. + +### `DistroIndex.discord: object` + +Global settings for [Discord Rich Presence](https://discordapp.com/developers/docs/rich-presence/how-to). + +**Properties** + +* `discord.clientId: string` - Client ID for th Application registered with Discord. +* `discord.smallImageText: string` - Tootltip for the `smallImageKey`. +* `discord.smallImageKey: string` - Name of the uploaded image for the small profile artwork. + + +### `DistroIndex.rcf: string/url` + +A URL to a DPSoftware RCF feed. Used for loading news. + +--- + +## Server Object + +#### Example +```JSON +{ + "id": "Example_Server", + "name": "WesterosCraft Example Client", + "description": "Example WesterosCraft server. Connect for fun!", + "icon": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/example_icon.png", + "version": "0.0.1", + "address": "mc.westeroscraft.com:1337", + "minecraftVersion": "1.11.2", + "discord": { + "shortId": "Example", + "largeImageText": "WesterosCraft Example Server", + "largeImageKey": "server-example" + }, + "mainServer": true, + "autoconnect": true, + "modules": [] +} +``` + +### `Server.id: string` + +The ID of the server. The launcher saves mod configurations and selected servers by ID. If the ID changes, all data related to the old ID **will be wiped**. + +### `Server.name: string` + +The name of the server. This is what users see on the UI. + +### `Server.description: string` + +A brief description of the server. Displayed on the UI to provide users more information. + +### `Server.icon: string/url` + +A URL to the server's icon. Will be displayed on the UI. + +### `Server.version: string/semver` + +The version of the server configuration. + +### `Server.address: string/url` + +The server's IP address. + +### `Server.minecraftVersion: string` + +The version of minecraft that the server is running. + +### `Server.discord: object` + +Server specific settings used for [Discord Rich Presence](https://discordapp.com/developers/docs/rich-presence/how-to). + +**Properties** + +* `discord.shortId: string` - Short ID for the server. Displayed on the second status line as `Server: shortId` +* `discord.largeImageText: string` - Ttooltip for the `largeImageKey`. +* `discord.largeImageKey: string` - Name of the uploaded image for the large profile artwork. + +### `Server.mainServer: boolean` + +Only one server in the array should have the `mainServer` property enabled. This will tell the launcher that this is the default server to select if either the previously selected server is invalid, or there is no previously selected server. If this field is not defined by any server (avoid this), the first server will be selected as the default. If multiple servers have `mainServer` enabled, the first one the launcher finds will be the effective value. Servers which are not the default may omit this property rather than explicitly setting it to false. + +### `Server.autoconnect: boolean` + +Whether or not the server can be autoconnected to. If false, the server will not be autoconnected to even when the user has the autoconnect setting enabled. + +### `Server.javaOptions: JavaOptions` + +**OPTIONAL** + +Sever-specific Java options. If not provided, defaults are used by the client. + +### `Server.modules: Module[]` + +An array of module objects. + +--- + +## JavaOptions Object + +Server-specific Java options. + +#### Example +```JSON +{ + "supported": ">=17", + "suggestedMajor": 17, + "platformOptions": [ + { + "platform": "darwin", + "architecture": "arm64", + "distribution": "CORRETTO" + } + ], + "ram": { + "recommended": 3072, + "minimum": 2048 + } +} +``` + +### `JavaOptions.platformOptions: JavaPlatformOptions[]` + +**OPTIONAL** + +Platform-specific java rules for this server configuration. Validation rules will be delegated to the client for any undefined properties. Java validation can be configured for specific platforms and architectures. The most specific ruleset will be applied. + +Maxtrix Precedence (Highest - Lowest) + - Current platform, current architecture (ex. win32 x64). + - Current platform, any architecture (ex. win32). + - Java Options base properties. + - Client logic (default logic in the client). + +Properties: + + - `platformOptions.platform: string` - The platform that this validation matrix applies to. + - `platformOptions.architecture: string` - Optional. The architecture that this validation matrix applies to. If omitted, applies to all architectures. + - `platformOptions.distribution: string` - Optional. See `JavaOptions.distribution`. + - `platformOptions.supported: string` - Optional. See `JavaOptions.supported`. + - `platformOptions.suggestedMajor: number` - Optional. See `JavaOptions.suggestedMajor`. + +### `JavaOptions.ram: object` + +**OPTIONAL** + +This allows you to require a minimum and recommended amount of RAM per server instance. The minimum is the smallest value the user can select in the settings slider. The recommended value will be the default value selected for that server. These values are specified in megabytes and must be an interval of 512. This allows configuration in intervals of half gigabytes. In the above example, the recommended ram value is 3 GB (3072 MB) and the minimum is 2 GB (2048 MB). + + - `ram.recommended: number` - The recommended amount of RAM in megabytes. Must be an interval of 512. + - `ram.minimum: number` - The absolute minimum amount of RAM in megabytes. Must be an interval of 512. + +### `JavaOptions.distribution: string` + +**OPTIONAL** + +Preferred JDK distribution to download if no applicable installation could be found. If omitted, the client will decide (decision may be platform-specific). + +### `JavaOptions.supported: string` + +**OPTIONAL** + +A semver range of supported JDK versions. + +Java version syntax is platform dependent. + +JDK 8 and prior +``` +1.{major}.{minor}_{patch}-b{build} +Ex. 1.8.0_152-b16 +``` + +JDK 9+ +``` +{major}.{minor}.{patch}+{build} +Ex. 11.0.12+7 +``` + +For processing, all versions will be translated into a semver compliant string. JDK 9+ is already semver. For versions 8 and below, `1.{major}.{minor}_{patch}-b{build}` will be translated to `{major}.{minor}.{patch}+{build}`. + +If specified, you must also specify suggestedMajor. + +If omitted, the client will decide based on the game version. + +### `JavaOptions.suggestedMajor: number` + +**OPTIONAL** + +The suggested major Java version. The suggested major should comply with the version range specified by supported, if defined. This will be used in messages displayed to the end user, and to automatically fetch a Java version. + +NOTE If supported is specified, suggestedMajor must be set. The launcher's default value may not comply with your custom major supported range. + +Common use case: + - supported: '>=17.x' + - suggestedMajor: 17 + +More involved: + - supported: '>=16 <20' + - suggestedMajor: 17 + +Given a wider support range, it becomes necessary to specify which major version in the range is the suggested. + +--- + +## Module Object + +A module is a generic representation of a file required to run the minecraft client. + +#### Example +```JSON +{ + "id": "com.example:artifact:1.0.0@jar.pack.xz", + "name": "Artifact 1.0.0", + "type": "Library", + "artifact": { + "size": 4231234, + "MD5": "7f30eefe5c51e1ae0939dab2051db75f", + "url": "http://files.site.com/maven/com/example/artifact/1.0.0/artifact-1.0.0.jar.pack.xz" + }, + "subModules": [ + { + "id": "examplefile", + "name": "Example File", + "type": "File", + "artifact": { + "size": 23423, + "MD5": "169a5e6cf30c2cc8649755cdc5d7bad7", + "path": "examplefile.txt", + "url": "http://files.site.com/examplefile.txt" + } + } + ] +} +``` + +The parent module will be stored maven style, it's destination path will be resolved by its id. The sub module has a declared `path`, so that value will be used. + +### `Module.id: string` + +The ID of the module. All modules that are not of type `File` **MUST** use a maven identifier. Version information and other metadata is pulled from the identifier. Modules which are stored maven style use the identifier to resolve the destination path. If the `extension` is not provided, it defaults to `jar`. + +**Template** + +`my.group:arifact:version@extension` + +`my/group/artifact/version/artifact-version.extension` + +**Example** + +`net.minecraft:launchwrapper:1.12` OR `net.minecraft:launchwrapper:1.12@jar` + +`net/minecraft/launchwrapper/1.12/launchwrapper-1.12.jar` + +If the module's artifact does not declare the `path` property, its path will be resolved from the ID. + +### `Module.name: string` + +The name of the module. Used on the UI. + +### `Module.type: string` + +The type of the module. + +### `Module.classpath: boolean` + +**OPTIONAL** + +If the module is of type `Library`, whether the library should be added to the classpath. Defaults to true. + +### `Module.required: Required` + +**OPTIONAL** + +Defines whether or not the module is required. If omitted, then the module will be required. + +Only applicable for modules of type: +* `ForgeMod` +* `LiteMod` +* `LiteLoader` + + +### `Module.artifact: Artifact` + +The download artifact for the module. + +### `Module.subModules: Module[]` + +**OPTIONAL** + +An array of sub modules declared by this module. Typically, files which require other files are declared as submodules. A quick example would be a mod, and the configuration file for that mod. Submodules can also declare submodules of their own. The file is parsed recursively, so there is no limit. + + +## Artifact Object + +The format of the module's artifact depends on several things. The most important factor is where the file will be stored. If you are providing a simple file to be placed in the root directory of the client files, you may decided to format the module as the `examplefile` module declared above. This module provides a `path` option, allowing you to directly set where the file will be saved to. Only the `path` will affect the final downloaded file. + +Other times, you may want to store the files maven-style, such as with libraries and mods. In this case you must declare the module as the example artifact above. The module `id` will be used to resolve the final path, effectively replacing the `path` property. It must be provided in maven format. More information on this is provided in the documentation for the `id` property. + +The resolved/provided paths are appended to a base path depending on the module's declared type. + +| Type | Path | +| ---- | ---- | +| `ForgeHosted` | ({`commonDirectory`}/libraries/{`path` OR resolved}) | +| `Fabric` | ({`commonDirectory`}/libraries/{`path` OR resolved}) | +| `LiteLoader` | ({`commonDirectory`}/libraries/{`path` OR resolved}) | +| `Library` | ({`commonDirectory`}/libraries/{`path` OR resolved}) | +| `ForgeMod` | ({`commonDirectory`}/modstore/{`path` OR resolved}) | +| `LiteMod` | ({`commonDirectory`}/modstore/{`path` OR resolved}) | +| `FabricMod` | ({`commonDirectory`}/mods/fabric/{`path` OR resolved}) | +| `File` | ({`instanceDirectory`}/{`Server.id`}/{`path` OR resolved}) | + +The `commonDirectory` and `instanceDirectory` values are stored in the launcher's config.json. + +### `Artifact.size: number` + +The size of the artifact. + +### `Artifact.MD5: string` + +The MD5 hash of the artifact. This will be used to validate local artifacts. + +### `Artifact.path: string` + +**OPTIONAL** + +A relative path to where the file will be saved. This is appended to the base path for the module's declared type. + +If this is not specified, the path will be resolved based on the module's ID. + +### `Artifact.url: string/url` + +The artifact's download url. + +## Required Object + +### `Required.value: boolean` + +**OPTIONAL** + +If the module is required. Defaults to true if this property is omited. + +### `Required.def: boolean` + +**OPTIONAL** + +If the module is enabled by default. Has no effect unless `Required.value` is false. Defaults to true if this property is omited. + +--- + +## Module Types + +### ForgeHosted + +The module type `ForgeHosted` represents forge itself. Currently, the launcher only supports modded servers, as vanilla servers can be connected to via the mojang launcher. The `Hosted` part is key, this means that the forge module must declare its required libraries as submodules. + +Ex. + +```json +{ + "id": "net.minecraftforge:forge:1.11.2-13.20.1.2429", + "name": "Minecraft Forge 1.11.2-13.20.1.2429", + "type": "ForgeHosted", + "artifact": { + "size": 4450992, + "MD5": "3fcc9b0104f0261397d3cc897e55a1c5", + "url": "http://files.minecraftforge.net/maven/net/minecraftforge/forge/1.11.2-13.20.1.2429/forge-1.11.2-13.20.1.2429-universal.jar" + }, + "subModules": [ + { + "id": "net.minecraft:launchwrapper:1.12", + "name": "Mojang (LaunchWrapper)", + "type": "Library", + "artifact": { + "size": 32999, + "MD5": "934b2d91c7c5be4a49577c9e6b40e8da", + "url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/launchwrapper-1.12.jar" + } + } + ] +} +``` + +All of forge's required libraries are declared in the `version.json` file found in the root of the forge jar file. These libraries MUST be hosted and declared a submodules or forge will not work. + +There were plans to add a `Forge` type, in which the required libraries would be resolved by the launcher and downloaded from forge's servers. The forge servers are down at times, however, so this plan was stopped half-implemented. + +--- + +### Fabric + +The module type `Fabric` represents the fabric mod loader. Currently, the launcher only supports modded servers, as vanilla servers can be connected to via the mojang launcher. + +Ex. + +```json +{ + "id": "net.fabricmc:fabric-loader:0.15.0", + "name": "Fabric (fabric-loader)", + "type": "Fabric", + "artifact": { + "size": 1196222, + "MD5": "a43d5a142246801343b6cedef1c102c4", + "url": "http://localhost:8080/repo/lib/net/fabricmc/fabric-loader/0.15.0/fabric-loader-0.15.0.jar" + }, + "subModules": [ + { + "id": "1.20.1-fabric-0.15.0", + "name": "Fabric (version.json)", + "type": "VersionManifest", + "artifact": { + "size": 2847, + "MD5": "69a2bd43452325ba1bc882fa0904e054", + "url": "http://localhost:8080/repo/versions/1.20.1-fabric-0.15.0/1.20.1-fabric-0.15.0.json" + } + } +} +``` + +Fabric works similarly to Forge 1.13+. + +--- + +### LiteLoader + +The module type `LiteLoader` represents liteloader. It is handled as a library and added to the classpath at runtime. Special launch conditions are executed when liteloader is present and enabled. This module can be optional and toggled similarly to `ForgeMod` and `Litemod` modules. + +Ex. +```json +{ + "id": "com.mumfrey:liteloader:1.11.2", + "name": "Liteloader (1.11.2)", + "type": "LiteLoader", + "required": { + "value": false, + "def": false + }, + "artifact": { + "size": 1685422, + "MD5": "3a98b5ed95810bf164e71c1a53be568d", + "url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/liteloader-1.11.2.jar" + }, + "subModules": [ + "All LiteMods go here" + ] +} +``` + +--- + +### Library + +The module type `Library` represents a library file which will be required to start the minecraft process. Each library module will be dynamically added to the `-cp` (classpath) argument while building the game process. + +Ex. + +```json +{ + "id": "net.sf.jopt-simple:jopt-simple:4.6", + "name": "Jopt-simple 4.6", + "type": "Library", + "artifact": { + "size": 62477, + "MD5": "13560a58a79b46b82057686543e8d727", + "url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/jopt-simple-4.6.jar" + } +} +``` + +--- + +### ForgeMod + +The module type `ForgeMod` represents a mod loaded by the Forge Mod Loader (FML). These files are stored maven-style and passed to FML using forge's [Modlist format](https://github.com/MinecraftForge/FML/wiki/New-JSON-Modlist-format). + +Ex. +```json +{ + "id": "com.westeroscraft:westerosblocks:3.0.0-beta-6-133", + "name": "WesterosBlocks (3.0.0-beta-6-133)", + "type": "ForgeMod", + "artifact": { + "size": 16321712, + "MD5": "5a89e2ab18916c18965fc93a0766cc6e", + "url": "http://mc.westeroscraft.com/WesterosCraftLauncher/prod-1.11.2/mods/WesterosBlocks.jar" + } +} +``` + +--- + +### LiteMod + +The module type `LiteMod` represents a mod loaded by liteloader. These files are stored maven-style and passed to liteloader using forge's [Modlist format](https://github.com/MinecraftForge/FML/wiki/New-JSON-Modlist-format). Documentation for liteloader's implementation of this can be found on [this issue](http://develop.liteloader.com/liteloader/LiteLoader/issues/34). + +Ex. +```json +{ + "id": "com.mumfrey:macrokeybindmod:0.14.4-1.11.2@litemod", + "name": "Macro/Keybind Mod (0.14.4-1.11.2)", + "type": "LiteMod", + "required": { + "value": false, + "def": false + }, + "artifact": { + "size": 1670811, + "MD5": "16080785577b391d426c62c8d3138558", + "url": "http://mc.westeroscraft.com/WesterosCraftLauncher/prod-1.11.2/mods/macrokeybindmod.litemod" + } +} +``` + +--- + +### File + +The module type `file` represents a generic file required by the client, another module, etc. These files are stored in the server's instance directory. + +Ex. + +```json +{ + "id": "com.westeroscraft:westeroscraftrp:2017-08-16", + "name": "WesterosCraft Resource Pack (2017-08-16)", + "type": "file", + "artifact": { + "size": 45241339, + "MD5": "ec2d9fdb14d5c2eafe5975a240202f1a", + "path": "resourcepacks/WesterosCraft.zip", + "url": "http://mc.westeroscraft.com/WesterosCraftLauncher/prod-1.11.2/resourcepacks/WesterosCraft.zip" + } +} +``` diff --git a/index.js b/index.js index 3620fc7..d442f18 100644 --- a/index.js +++ b/index.js @@ -229,7 +229,7 @@ function createWindow() { win = new BrowserWindow({ width: 1280, height: 720, - icon: getPlatformIcon('SealCircle'), + //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 709dbc9..b02ed1b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,13 +1,13 @@ { - "name": "helioslauncher", + "name": "dmblauncher", "version": "2.2.1", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "helioslauncher", + "name": "dmblauncher", "version": "2.2.1", - "license": "UNLICENSED", + "license": "UNLICENSED/MIT (Some part of DPSoftware)", "dependencies": { "@electron/remote": "^2.1.2", "adm-zip": "^0.5.12", @@ -22,6 +22,7 @@ "helios-core": "~2.2.1", "helios-distribution-types": "^1.3.0", "jquery": "^3.7.1", + "lodash": "^4.17.21", "lodash.merge": "^4.6.2", "semver": "^7.6.0", "toml": "^3.0.0" @@ -3304,7 +3305,7 @@ "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true + "license": "MIT" }, "node_modules/lodash.defaults": { "version": "4.2.0", diff --git a/package.json b/package.json index 252d17e..774aa34 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ "helios-core": "~2.2.1", "helios-distribution-types": "^1.3.0", "jquery": "^3.7.1", + "lodash": "^4.17.21", "lodash.merge": "^4.6.2", "semver": "^7.6.0", "toml": "^3.0.0" diff --git a/run.bat b/run.bat index b896a08..4e36807 100644 --- a/run.bat +++ b/run.bat @@ -1 +1,2 @@ +@echo off npm run dev \ No newline at end of file