Skip to content

Commit efdcbec

Browse files
committed
Update version to 1.4.0
1 parent 6e80a95 commit efdcbec

File tree

4 files changed

+1147
-533
lines changed

4 files changed

+1147
-533
lines changed

app/assets/css/launcher.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3308,10 +3308,10 @@ input:checked + .toggleSwitchSlider:before {
33083308
transition-delay:0s;
33093309
}
33103310

3311-
/* Twitter icon colors. */
3312-
#twitterSVG:hover,
3313-
#twitterURL:focus #twitterSVG {
3314-
fill: #1da1f2;
3311+
/* X icon colors. */
3312+
#xSVG:hover,
3313+
#xURL:focus #xSVG {
3314+
fill: #000000;
33153315
}
33163316
#twitterSVG:active {
33173317
fill: #1b8dd4;

app/assets/js/processbuilder.js

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,11 @@ class ProcessBuilder {
5858
args = args.concat(this.constructModList(modObj.fMods))
5959
}
6060

61-
logger.info('Launch Arguments:', args)
61+
// Hide access token
62+
const loggableArgs = [...args]
63+
loggableArgs[loggableArgs.findIndex(x => x === this.authUser.accessToken)] = '**********'
64+
65+
logger.info('Launch Arguments:', loggableArgs)
6266

6367
const child = child_process.spawn(ConfigManager.getJavaExecutable(this.server.rawServer.id), args, {
6468
cwd: this.gameDir,
@@ -832,9 +836,7 @@ class ProcessBuilder {
832836
libs[mdl.getVersionlessMavenIdentifier()] = mdl.getPath()
833837
if(mdl.subModules.length > 0){
834838
const res = this._resolveModuleLibraries(mdl)
835-
if(res.length > 0){
836-
libs = {...libs, ...res}
837-
}
839+
libs = {...libs, ...res}
838840
}
839841
}
840842
}
@@ -843,9 +845,7 @@ class ProcessBuilder {
843845
for(let i=0; i<mods.length; i++){
844846
if(mods.sub_modules != null){
845847
const res = this._resolveModuleLibraries(mods[i])
846-
if(res.length > 0){
847-
libs = {...libs, ...res}
848-
}
848+
libs = {...libs, ...res}
849849
}
850850
}
851851

@@ -856,27 +856,25 @@ class ProcessBuilder {
856856
* Recursively resolve the path of each library required by this module.
857857
*
858858
* @param {Object} mdl A module object from the server distro index.
859-
* @returns {Array.<string>} An array containing the paths of each library this module requires.
859+
* @returns {{[id: string]: string}} An object containing the paths of each library this server requires.
860860
*/
861861
_resolveModuleLibraries(mdl){
862862
if(!mdl.subModules.length > 0){
863-
return []
863+
return {}
864864
}
865-
let libs = []
865+
let libs = {}
866866
for(let sm of mdl.subModules){
867867
if(sm.rawModule.type === Type.Library){
868868

869869
if(sm.rawModule.classpath ?? true) {
870-
libs.push(sm.getPath())
870+
libs[sm.getVersionlessMavenIdentifier()] = sm.getPath()
871871
}
872872
}
873873
// If this module has submodules, we need to resolve the libraries for those.
874874
// To avoid unnecessary recursive calls, base case is checked here.
875875
if(mdl.subModules.length > 0){
876876
const res = this._resolveModuleLibraries(sm)
877-
if(res.length > 0){
878-
libs = libs.concat(res)
879-
}
877+
libs = {...libs, ...res}
880878
}
881879
}
882880
return libs

package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "gaialauncher",
3-
"version": "1.3.2",
3+
"version": "1.4.0",
44
"productName": "Gaïa Launcher",
55
"description": "Modded Minecraft Launcher",
66
"author": "Valbion Group",
@@ -29,22 +29,21 @@
2929
"discord-rpc-patch": "^4.0.1",
3030
"ejs": "^3.1.10",
3131
"ejs-electron": "^2.1.1",
32-
"electron-updater": "^5.3.0",
32+
"electron-updater": "^6.6.2",
3333
"fs-extra": "^11.3.2",
3434
"gaialauncher-core": "^1.3.0",
3535
"gaialauncher-distribution-types": "^1.3.0",
3636
"github-syntax-dark": "^0.5.0",
3737
"got": "^11.8.6",
3838
"jquery": "^3.7.1",
3939
"node-stream-zip": "^1.15.0",
40-
"request": "^2.88.2",
4140
"semver": "^7.7.3",
4241
"tar-fs": "^2.1.4",
4342
"winreg": "^1.2.5"
4443
},
4544
"devDependencies": {
46-
"electron": "^24.8.8",
47-
"electron-builder": "^23.6.0",
45+
"electron": "^33.4.11",
46+
"electron-builder": "^25.1.8",
4847
"eslint": "^8.57.1"
4948
},
5049
"repository": {

0 commit comments

Comments
 (0)