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" } },