Fix

locales/version

@@ -1 +1 @@
-4.1.0
+4.1.1

package.json

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

src/launcher.ts

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

src/loaders/fabriclike/fabriclike.ts

@@ -6,6 +6,7 @@ import { Launcher } from "../../launcher.js";
 import { ModDisplayInfo, ModInfo } from "../../mods/mod.js";
 import { MCVersion } from "../../schemas.js";
 import { merge } from "../../utils/MergeVersionJSONs.js";
+import { transformJSON } from "../../utils/transformJSON.js";
 import { MinecraftVersion } from "../../version.js";
 import { FabricModJson } from "../fabric_schemas.js";
 import { Loader, ModLoadingIssue } from "../loader.js";
@@ -33,7 +34,7 @@ export abstract class FabricLikeLoader<T extends FabricLikeVersionInfo, M> imple
         const entry = await zip.entry("fabric.mod.json");
         if(entry === undefined)return [];
         const result: ModInfo<FabricModJson | M>[] = [];
-        const json: FabricModJson = JSON.parse((await zip.entryData(entry)).toString());
+        const json: FabricModJson = JSON.parse(transformJSON((await zip.entryData(entry)).toString()));
         if(json.jars !== undefined){
             for (const jar of json.jars) {
                 const paths = jar.file.split("/");

src/loaders/forge/forge.ts

@@ -16,6 +16,7 @@ import { merge } from "../../utils/MergeVersionJSONs.js";
 import { checkFile } from "../../utils/check_file.js";
 import { download } from "../../utils/downloads.js";
 import { expandMavenId } from "../../utils/maven.js";
+import { transformJSON } from "../../utils/transformJSON.js";
 import { MinecraftVersion } from "../../version.js";
 import { Loader, ModLoadingIssue } from "../loader.js";
 import { ForgeJarJarJson, ForgeMcmodInfo, ForgeMcmodInfoOne, ForgeModsToml, StoreData } from "./forge_schemas.js";
@@ -144,7 +145,7 @@ export class ForgeLoader implements Loader<StoreData | ForgeMcmodInfoOne> {
         const ret: ModInfo<StoreData | ForgeMcmodInfoOne>[] = [];
         const jarJarEntry = await zip.entry("META-INF/jarjar/metadata.json");
         if(jarJarEntry) {
-            const data: ForgeJarJarJson = JSON.parse((await zip.entryData(jarJarEntry)).toString());
+            const data: ForgeJarJarJson = JSON.parse(transformJSON((await zip.entryData(jarJarEntry)).toString()));
             for (const jarObj of data.jars) {
                 const jar = jarObj.path;
                 const paths = jar.split("/");

src/loaders/quilt/quilt.ts

@@ -2,6 +2,7 @@ import StreamZip from "node-stream-zip";
 import { tmpdir } from "os";
 import { ModDisplayInfo, ModInfo } from "../../mods/mod.js";
 import { MCVersion } from "../../schemas.js";
+import { transformJSON } from "../../utils/transformJSON.js";
 import { checkFabricDeps } from "../fabric.js";
 import { FabricModJson } from "../fabric_schemas.js";
 import { FabricLikeLoader, checkMatch, formatDepVersion, normalizeVersion } from "../fabriclike/fabriclike.js";
@@ -27,7 +28,7 @@ export class QuiltLoader extends FabricLikeLoader<QuiltVersionInfo, QuiltModJson
         const entry = await zip.entry("quilt.mod.json");
         if(entry === undefined)return super.findModInfos(path);
         const result: ModInfo<QuiltModJson | FabricModJson>[] = await super.findModInfos(path);
-        const json: QuiltModJson = JSON.parse((await zip.entryData(entry)).toString());
+        const json: QuiltModJson = JSON.parse(transformJSON((await zip.entryData(entry)).toString()));
         if(json.quilt_loader.jars !== undefined){
             for (const jar of json.quilt_loader.jars) {
                 const paths = jar.split("/");

src/utils/transformJSON.ts

@@ -0,0 +1,24 @@
+export function transformJSON(source: string): string {
+    const result = [];
+    let isStr = false;
+    for(const i of source) {
+        switch (i) {
+            case '"':
+            case "'":
+                isStr = !isStr;
+                result.push(i);
+                break;
+
+            case '\n':
+                if (isStr) {
+                    result.push("\\n");
+                    break;
+                }
+
+            default:
+                result.push(i);
+                break;
+        }
+    }
+    return result.join("");
+}

src/version.ts

@@ -1,4 +1,4 @@
-import cp, { ChildProcess } from "child_process";
+import cp, { ChildProcess, exec } from "child_process";
 import compressing from "compressing";
 import fs, { PathLike } from "fs";
 import { ensureDir, mkdirs } from "fs-extra";
@@ -7,6 +7,7 @@ import got from "got";
 import StreamZip from "node-stream-zip";
 import os from "os";
 import path from "path";
+import { promisify } from "util";
 import { Account } from "./auth/account.js";
 import { FormattedError } from "./errors/FormattedError.js";
 import { ContentType, ContentVersion } from "./index.js";
@@ -136,8 +137,8 @@ export class MinecraftVersion {
     async run(account: Account<never>): Promise<ChildProcess> {
         const progress = this.launcher.createProgress(5, "version.progress.run", "version.progress.account_login");
         try {
-            if (!account.check()) {
-                account.login();
+            if (!await account.check()) {
+                await account.login();
             }
             progress.update("version.progress.account_prepare");
             await account.prepareLaunch(this.versionLaunchWorkDir);
@@ -153,6 +154,7 @@ export class MinecraftVersion {
                 .concat(args)
                 .concat(this.extras.moreGameArguments ?? []);
             progress.update("version.progress.done");
+            if (this.extras.beforeCommand) await promisify(exec)(this.extras.beforeCommand);
             return cp.execFile(this.extras.usingJava ?? this.launcher.usingJava, allArguments, {
                 cwd: this.versionLaunchWorkDir
             });