4.0.0-alpha.7

locales/version

@@ -1 +1 @@
-4.0.0-alpha.6
+4.0.0-alpha.7

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dmclc",
-  "version": "4.0.0-alpha.6",
+  "version": "4.0.0-alpha.7",
   "description": "Dolphin Minecraft Launcher Core",
   "typings": "./lib/index.d.ts",
   "module": "./lib/index.js",

src/auth/account.ts

@@ -21,7 +21,7 @@ export interface Account<T extends UserData> {
   /**
    * Prepare for launch. For example, download your Java Agent.
    */
-  prepareLaunch(): Promise<boolean>
+  prepareLaunch(versionDir: string): Promise<boolean>
   /**
    * Get extra JVM arguments. For example, Java Agent.
    */

src/auth/ali_account.ts

@@ -20,10 +20,10 @@ export class AuthlibInjectorAccount extends YggdrasilAccount<YggdrasilUserData>
         return await super.login();
     }
 
-    async prepareLaunch(): Promise<boolean> {
+    async prepareLaunch(versionDir: string): Promise<boolean> {
         const obj = await got("https://bmclapi2.bangbang93.com/mirrors/authlib-injector/artifact/latest.json").json<AuthlibInjectorArtifact>();
         const sha256 = obj.checksums.sha256;
-        const path = `${this.root.toString()}/authlib-injector-latest.jar`;
+        const path = `${versionDir}/authlib-injector-latest.jar`;
         if (!fs.existsSync(path) || !checkFile(path, sha256, "sha256")) {
             return await download(obj.download_url, path, this.launcher);
         }

src/auth/mul_account.ts

@@ -18,15 +18,15 @@ export class MinecraftUniversalLoginAccount extends YggdrasilAccount<MinecraftUn
         return await super.login();
     }
 
-    async prepareLaunch (): Promise<boolean> {
-        const path = `${this.root}/nide8auth.jar`;
+    async prepareLaunch(versionDir: string): Promise<boolean> {
+        const path = `${versionDir}/nide8auth.jar`;
         if (!fs.existsSync(path)) {
             return await download("https://login.mc-user.com:233/index/jar", path, this.launcher);
         }
         return true;
     }
 
-    async getLaunchJVMArgs (): Promise<string[]> {
+    async getLaunchJVMArgs(): Promise<string[]> {
         return [`-javaagent:./nide8auth.jar=${this.data.serverID}`, "-Dnide8auth.client=true"];
     }
     toString (): string {

src/auth/yggdrasil/yggdrasil_account.ts

@@ -14,7 +14,7 @@ export abstract class YggdrasilAccount<T extends YggdrasilUserData> implements A
         this.root = launcher.rootPath;
     }
 
-    abstract prepareLaunch(): Promise<boolean>;
+    abstract prepareLaunch(versionDir: string): Promise<boolean>;
     abstract getLaunchJVMArgs(mc: MinecraftVersion): Promise<string[]>;
     async getLaunchGameArgs(): Promise<Map<string, string>> {
         const map: Map<string, string> = new Map();

src/launcher.ts

@@ -63,7 +63,7 @@ export class Launcher {
         specialNatives: Record<string, Library>;
     };
     private realRootPath = "";
-    version = "4.0.0-alpha.6";
+    static readonly version = "4.0.0-alpha.7";
     /**
      * Create a new Launcher object.
      * @throws {@link FormattedError}

src/mods/manage/ModManager.ts

@@ -13,7 +13,8 @@ export class ModManager {
 
     async saveInfo(): Promise<void> {}
 
-    async findMods(moddir: string): Promise<ModJarInfo[]> {
+    async findMods(): Promise<ModJarInfo[]> {
+        const moddir = `${this.version.versionLaunchWorkDir}/mods`;
         const val: ModJarInfo[] = [];
         for (const mod of await fsPromises.readdir(moddir)) {
             const modJar = `${moddir}/${mod}`;
@@ -33,7 +34,7 @@ export class ModManager {
         let moddir = `${this.version.versionLaunchWorkDir}/mods`;
         if (!fs.existsSync(moddir) && fs.statSync(moddir).isDirectory()) return [];
         const loader = this.launcher.loaders.get(this.version.extras.loaders[0].name);
-        return loader?.checkMods((await this.findMods(moddir)).map(v=>v.manifests).flat(), this.version.extras.version, this.version.extras.loaders[0].version) ?? [];
+        return loader?.checkMods((await this.findMods()).map(v=>v.manifests).flat(), this.version.extras.version, this.version.extras.loaders[0].version) ?? [];
     }
 
     async searchMod(name: string, skip: number, limit: number): Promise<Content[]> {

src/version.ts

@@ -127,7 +127,7 @@ export class MinecraftVersion {
      * @returns The Minecraft process. Both stdout and stderr uses UTF-8.
      */
     async run(account: Account<never>): Promise<ChildProcess> {
-        await account.prepareLaunch();
+        await account.prepareLaunch(this.versionLaunchWorkDir);
         await this.completeVersionInstall();
         await this.extractNative(this.versionObject, this.name);
         const args = await this.getArguments(this.versionObject, account);