From acfa96c4ae3566cda6e6fb5dae5befd226e4a664 Mon Sep 17 00:00:00 2001 From: Maroxy Date: Sun, 28 Nov 2021 19:13:42 +0100 Subject: [PATCH] Fix Constants --- src/ts/lib/PrefixSelector.ts | 7 +++++++ src/ts/lib/constants.ts | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/ts/lib/PrefixSelector.ts b/src/ts/lib/PrefixSelector.ts index e96a439..f4cde0f 100644 --- a/src/ts/lib/PrefixSelector.ts +++ b/src/ts/lib/PrefixSelector.ts @@ -1,5 +1,6 @@ const fs = require('fs'); import LauncherLib from "./LauncherLib"; +import constants from "./constants"; const path = require('path'); const os = require('os'); @@ -15,6 +16,7 @@ export default class PrefixSelector LauncherLib.updateConfig('version', version); LauncherLib.updateConfig('prefix', location); + constants.prefixDir = location; this.prefix = location; } else if (fs.existsSync(path.join(location, 'drive_c', 'Program Files', 'Genshin Impact', 'GenshinImpact_Data', 'globalgamemanagers'))) { const config = fs.readFileSync(path.join(location, 'drive_c', 'Program Files', 'Genshin Impact', 'GenshinImpact_Data', 'globalgamemanagers'), { encoding: 'ascii' }); @@ -22,6 +24,7 @@ export default class PrefixSelector LauncherLib.updateConfig('version', version); LauncherLib.updateConfig('prefix', location); + constants.prefixDir = location; this.prefix = location; } else { console.log('Game not found.'); @@ -29,6 +32,7 @@ export default class PrefixSelector // Unset version if game is not found. LauncherLib.updateConfig('version', null); LauncherLib.updateConfig('prefix', location); + constants.prefixDir = location; this.prefix = location; } } @@ -43,6 +47,7 @@ export default class PrefixSelector LauncherLib.updateConfig('version', version); LauncherLib.updateConfig('prefix', dp); + constants.prefixDir = dp; this.prefix = dp; } else if (fs.existsSync(path.join(dp, 'drive_c', 'Program Files', 'Genshin Impact', 'GenshinImpact_Data', 'globalgamemanagers'))) { const config = fs.readFileSync(path.join(dp, 'drive_c', 'Program Files', 'Genshin Impact', 'GenshinImpact_Data', 'globalgamemanagers'), { encoding: 'ascii' }); @@ -50,6 +55,7 @@ export default class PrefixSelector LauncherLib.updateConfig('version', version); LauncherLib.updateConfig('prefix', dp); + constants.prefixDir = dp; this.prefix = dp; } else { console.log('Game not found.'); @@ -57,6 +63,7 @@ export default class PrefixSelector // Unset version if game is not found. LauncherLib.updateConfig('version', null); LauncherLib.updateConfig('prefix', dp); + constants.prefixDir = dp; this.prefix = dp; } } diff --git a/src/ts/lib/constants.ts b/src/ts/lib/constants.ts index 66ec63c..23cb4cc 100644 --- a/src/ts/lib/constants.ts +++ b/src/ts/lib/constants.ts @@ -1,5 +1,6 @@ const path = require('path'); const os = require('os'); +import LauncherLib from "./LauncherLib"; export default class constants { @@ -44,7 +45,7 @@ export default class constants public static readonly launcherDir: string = path.join(os.homedir(), '.local', 'share', 'anime-game-launcher'); - public static readonly prefixDir: string = path.join(this.launcherDir, 'game'); + public static prefixDir: string = LauncherLib.getConfig('prefix'); public static readonly gameDir: string = path.join(this.prefixDir, 'drive_c', 'Program Files', this.placeholders.uppercase.full); public static readonly voiceDir: string = path.join(this.gameDir, `${this.placeholders.uppercase.first + this.placeholders.uppercase.second}_Data`, 'StreamingAssets', 'Audio', 'GeneratedSoundBanks', 'Windows');