diff --git a/app/assets/images/backgrounds/1.jpg b/app/assets/images/backgrounds/1.jpg
new file mode 100644
index 00000000..490f8188
Binary files /dev/null and b/app/assets/images/backgrounds/1.jpg differ
diff --git a/app/assets/images/backgrounds/2.jpg b/app/assets/images/backgrounds/2.jpg
new file mode 100644
index 00000000..941ddb5e
Binary files /dev/null and b/app/assets/images/backgrounds/2.jpg differ
diff --git a/app/assets/images/backgrounds/3.jpg b/app/assets/images/backgrounds/3.jpg
new file mode 100644
index 00000000..0f6b63fc
Binary files /dev/null and b/app/assets/images/backgrounds/3.jpg differ
diff --git a/app/assets/images/backgrounds/4.jpg b/app/assets/images/backgrounds/4.jpg
new file mode 100644
index 00000000..ddf4266b
Binary files /dev/null and b/app/assets/images/backgrounds/4.jpg differ
diff --git a/app/assets/images/backgrounds/5.jpg b/app/assets/images/backgrounds/5.jpg
new file mode 100644
index 00000000..ccec3416
Binary files /dev/null and b/app/assets/images/backgrounds/5.jpg differ
diff --git a/app/assets/images/backgrounds/6.jpg b/app/assets/images/backgrounds/6.jpg
new file mode 100644
index 00000000..048b6f4c
Binary files /dev/null and b/app/assets/images/backgrounds/6.jpg differ
diff --git a/app/assets/images/backgrounds/7.jpg b/app/assets/images/backgrounds/7.jpg
new file mode 100644
index 00000000..a73530f8
Binary files /dev/null and b/app/assets/images/backgrounds/7.jpg differ
diff --git a/app/assets/js/scripts/landing.js b/app/assets/js/scripts/landing.js
index 7ea1f2d5..d112ef79 100644
--- a/app/assets/js/scripts/landing.js
+++ b/app/assets/js/scripts/landing.js
@@ -323,7 +323,7 @@ function asyncSystemScan(mcVersion, launchAfter = true){
// Show this information to the user.
setOverlayContent(
'No Compatible
Java Installation Found',
- 'In order to join WesterosCraft, you need a 64-bit installation of Java 8. Would you like us to install a copy? By installing, you accept Oracle\'s license agreement.',
+ 'In order to join ArdaCraft, you need a 64-bit installation of Java 8. Would you like us to install a copy? By installing, you accept Oracle\'s license agreement.',
'Install Java',
'Install Manually'
)
diff --git a/app/assets/js/scripts/uibinder.js b/app/assets/js/scripts/uibinder.js
index 27316f96..0b080d1b 100644
--- a/app/assets/js/scripts/uibinder.js
+++ b/app/assets/js/scripts/uibinder.js
@@ -9,7 +9,6 @@ const AuthManager = require('./assets/js/authmanager')
const ConfigManager = require('./assets/js/configmanager')
const DistroManager = require('./assets/js/distromanager')
const Lang = require('./assets/js/langloader')
-const randomPuppy = require('random-puppy')
let rscShouldLoad = false
let fatalStartupError = false
@@ -68,12 +67,7 @@ function showMainUI(data){
refreshServerStatus()
setTimeout(() => {
document.getElementById('frameBar').style.backgroundColor = 'rgba(0, 0, 0, 0.5)'
-
- randomPuppy('ardacraft').then(url => {
- var urlString = 'url(' + url + ')';
- document.body.style.backgroundImage = urlString;
- document.body.style.transition = 'background-image 7s ease'
- });
+ document.body.style.backgroundImage = `url('assets/images/backgrounds/${document.body.getAttribute('bkid')}.jpg')`
$('#main').show()
const isLoggedIn = Object.keys(ConfigManager.getAuthAccounts()).length > 0
diff --git a/package-lock.json b/package-lock.json
index 1c2af13a..2a06fe8b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -639,11 +639,6 @@
"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
"dev": true
},
- "capture-stack-trace": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz",
- "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw=="
- },
"caseless": {
"version": "0.12.0",
"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
@@ -796,14 +791,6 @@
"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
},
- "create-error-class": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
- "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
- "requires": {
- "capture-stack-trace": "^1.0.0"
- }
- },
"cross-env": {
"version": "7.0.2",
"resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.2.tgz",
@@ -969,7 +956,8 @@
"duplexer3": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
- "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI="
+ "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
+ "dev": true
},
"ecc-jsbn": {
"version": "0.1.2",
@@ -989,9 +977,9 @@
}
},
"ejs-electron": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/ejs-electron/-/ejs-electron-2.0.3.tgz",
- "integrity": "sha512-KkXCAh5QW2FZQ/Buj0dDmwaKyZU3KiCJ+4Jf85oZDEiLO+vTevOYYH5Efvg5JPV4GbQkmarJlW+ezk0+nVx0Ug==",
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/ejs-electron/-/ejs-electron-2.1.0.tgz",
+ "integrity": "sha512-ciJXLn9Rje/oTDlcW/l4fiRalNxbh54flyQTAL/OALUWiBesCFBQRuWHSnDUcJjhbyZiQNI/YEYxs+CzyDG38A==",
"requires": {
"ejs": "^2.6.1",
"mime": "^2.3.1"
@@ -1383,11 +1371,6 @@
"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
"dev": true
},
- "eventemitter3": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz",
- "integrity": "sha1-HIaZHYFq0eUEdQ5zh0Ik7PO+xQg="
- },
"extend": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
@@ -1843,21 +1826,6 @@
"integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==",
"dev": true
},
- "is-redirect": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
- "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ="
- },
- "is-retry-allowed": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
- "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg=="
- },
- "is-stream": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
- "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
- },
"is-typedarray": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
@@ -2078,9 +2046,9 @@
}
},
"lodash": {
- "version": "4.17.15",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
- "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+ "version": "4.17.19",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
+ "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
"dev": true
},
"lodash.isequal": {
@@ -2091,7 +2059,8 @@
"lowercase-keys": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
- "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="
+ "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
+ "dev": true
},
"lru-cache": {
"version": "5.1.1",
@@ -2139,9 +2108,9 @@
}
},
"mime": {
- "version": "2.4.4",
- "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
- "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA=="
+ "version": "2.4.6",
+ "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
+ "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA=="
},
"mime-db": {
"version": "1.43.0",
@@ -2448,54 +2417,6 @@
"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
"integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
},
- "random-puppy": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/random-puppy/-/random-puppy-1.1.0.tgz",
- "integrity": "sha1-GtqjTA83bVArWdb9gifqYaRUmTs=",
- "requires": {
- "eventemitter3": "^1.2.0",
- "got": "^6.3.0",
- "unique-random-array": "^1.0.0"
- },
- "dependencies": {
- "get-stream": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
- "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
- },
- "got": {
- "version": "6.7.1",
- "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
- "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
- "requires": {
- "create-error-class": "^3.0.0",
- "duplexer3": "^0.1.4",
- "get-stream": "^3.0.0",
- "is-redirect": "^1.0.0",
- "is-retry-allowed": "^1.0.0",
- "is-stream": "^1.0.0",
- "lowercase-keys": "^1.0.0",
- "safe-buffer": "^5.0.1",
- "timed-out": "^4.0.0",
- "unzip-response": "^2.0.1",
- "url-parse-lax": "^1.0.0"
- }
- },
- "prepend-http": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
- "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw="
- },
- "url-parse-lax": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
- "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
- "requires": {
- "prepend-http": "^1.0.1"
- }
- }
- }
- },
"rc": {
"version": "1.2.8",
"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
@@ -3073,11 +2994,6 @@
"integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
"dev": true
},
- "timed-out": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
- "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8="
- },
"to-readable-stream": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
@@ -3152,19 +3068,6 @@
"is-typedarray": "^1.0.0"
}
},
- "unique-random": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/unique-random/-/unique-random-1.0.0.tgz",
- "integrity": "sha1-zj4iTIJCzTOg53sNcYDXfmti0MQ="
- },
- "unique-random-array": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/unique-random-array/-/unique-random-array-1.0.1.tgz",
- "integrity": "sha512-z9J/SV8CUIhIRROcHe9YUoAT6XthUJt0oUyLGgobiXJprDP9O9dsErNevvSaAv5BkhwFEVPn6nIEOKeNE6Ck1Q==",
- "requires": {
- "unique-random": "^1.0.0"
- }
- },
"unique-string": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
@@ -3179,11 +3082,6 @@
"resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
"integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug=="
},
- "unzip-response": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz",
- "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c="
- },
"update-notifier": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.0.tgz",
diff --git a/package.json b/package.json
index 3ec4f2dc..bd04a403 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
"async": "^3.2.0",
"discord-rpc": "^3.1.1",
"ejs": "^3.1.3",
- "ejs-electron": "^2.0.3",
+ "ejs-electron": "^2.1.0",
"electron-updater": "^4.3.1",
"fs-extra": "^9.0.1",
"github-syntax-dark": "^0.5.0",
@@ -37,8 +37,7 @@
"request": "^2.88.2",
"semver": "^7.3.2",
"tar-fs": "^2.1.0",
- "winreg": "^1.2.4",
- "random-puppy": "^1.1.0"
+ "winreg": "^1.2.4"
},
"devDependencies": {
"cross-env": "^7.0.2",