4.3.0-beta.4: Fix Neo install

Signed-off-by: 黑嫖233 <[email protected]>

locales/version

@@ -1 +1 @@
-4.3.0-beta.3
+4.3.0-beta.4

package.json

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

src/launcher.ts

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

src/loaders/forge.ts

@@ -6,6 +6,10 @@ export class ForgeLoader extends ForgeLikeLoader {
     protected supportsOld = false;
     name = "forge";
 
+    matchVersion(loader: string, mc: string): boolean {
+        return loader.startsWith(`${mc}-`);
+    }
+
     getArchiveBaseName(MCVersion: string): string {
         return "forge";
     }

src/loaders/forgelike/forgelike.ts

@@ -34,6 +34,7 @@ export abstract class ForgeLikeLoader implements Loader<StoreData | ForgeMcmodIn
 
     abstract findInVersion(MCVersion: MCVersion): string | undefined;
     abstract getArchiveBaseName(MCVersion: string): string;
+    abstract matchVersion(loader: string, mc: string): boolean;
 
     async getSuitableLoaderVersions (MCVersion: MinecraftVersion): Promise<string[]> {
         if(MCVersion.extras.version === "Unknown") {
@@ -48,7 +49,7 @@ export abstract class ForgeLikeLoader implements Loader<StoreData | ForgeMcmodIn
         const res = await got(`${this.mavenArtifactURL}/${this.getArchiveBaseName(MCVersion.extras.version)}/maven-metadata.xml`);
         const obj = await parseStringPromise(res.body);
         const versions: string[] = obj.metadata.versioning[0].versions[0].version;
-        return versions.filter((v: string) => v.startsWith(`${MCVersion.extras.version}-`));
+        return versions.filter((v: string) => this.matchVersion(v, MCVersion.extras.version));
     }
 
     async install (MCVersion: MinecraftVersion, version: string): Promise<boolean> {

src/loaders/neoforge.ts

@@ -6,8 +6,15 @@ export class NeoForgeLoader extends ForgeLikeLoader {
     protected supportsOld = false;
     name = "neoforge";
 
+    matchVersion(loader: string, mc: string): boolean {
+        if (mc === "1.20.1") {
+            return loader.startsWith("1.20.1-");
+        } else if (mc.includes("-") || mc.includes("w")) return false;
+        return loader.startsWith(mc.slice(2));
+    }
+
     getArchiveBaseName(MCVersion: string): string {
-        if (MCVersion.startsWith("1.20.1")) {
+        if (MCVersion === "1.20.1") {
             return "forge";
         }
         return "neoforge";