From 5ab3ca9f4a9829f87a470c7208d51d89cd453015 Mon Sep 17 00:00:00 2001 From: HerozDotExe Date: Tue, 17 Mar 2026 19:22:21 +0100 Subject: [PATCH] fix: make generator generate actual neoforge tests --- tests/forge-java.test.ts.template | 2 +- tests/forge.test.ts.template | 2 +- tests/generator.js | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/forge-java.test.ts.template b/tests/forge-java.test.ts.template index 4e06f09..c4d6aa6 100644 --- a/tests/forge-java.test.ts.template +++ b/tests/forge-java.test.ts.template @@ -21,7 +21,7 @@ test("launch game", { timeout: 0, tags:["full", "forge"] }, async () => { instance.setPaths(gameRoot); instance.setAuth(auth); instance.setJavaExecutable("${java}") - instance.setModLoader("forge", "${forge_version}"); + instance.setModLoader("${modloader}", "${modloader_version}"); instance.on("progress", console.log); diff --git a/tests/forge.test.ts.template b/tests/forge.test.ts.template index e0d1a8f..e609a7b 100644 --- a/tests/forge.test.ts.template +++ b/tests/forge.test.ts.template @@ -21,7 +21,7 @@ test("launch game", { timeout: 0, tags:["full", "forge"] }, async () => { instance.setPaths(gameRoot); instance.setAuth(auth); instance.setJavaExecutable(java) - instance.setModLoader("forge", "${forge_version}"); + instance.setModLoader("${modloader}", "${modloader_version}"); instance.on("progress", console.log); diff --git a/tests/generator.js b/tests/generator.js index d36f9d8..6405171 100644 --- a/tests/generator.js +++ b/tests/generator.js @@ -68,10 +68,10 @@ await fs.mkdir(path.join(tempFolder, "modloaders/neoforge")) let result = "" if (java) { const template = await fs.readFile(path.join(tempFolder, "forge-java.test.ts.template"), { encoding: "utf-8" }) - result = template.replaceAll("${version}", version).replace("${forge_version}", forgeVersion).replace("${java}", await getJava(version)) + result = template.replaceAll("${version}", version).replace("${modloader}", "forge").replace("${modloader_version}", forgeVersion).replace("${java}", await getJava(version)) } else { const template = await fs.readFile(path.join(tempFolder, "forge.test.ts.template"), { encoding: "utf-8" }) - result = template.replaceAll("${version}", version).replace("${forge_version}", forgeVersion) + result = template.replaceAll("${version}", version).replace("${modloader}", "forge").replace("${modloader_version}", forgeVersion) } await fs.writeFile(path.join(tempFolder, `modloaders/forge/forge-${version}-${forgeVersion}.test.ts`), result) console.log(`Done forge ${forgeVersion}`) @@ -100,10 +100,10 @@ await fs.mkdir(path.join(tempFolder, "modloaders/neoforge")) let result = "" if (java) { const template = await fs.readFile(path.join(tempFolder, "forge-java.test.ts.template"), { encoding: "utf-8" }) - result = template.replaceAll("${version}", mcVersion).replace("${forge_version}", neoForgeVersion).replace("${java}", await getJava(mcVersion)) + result = template.replaceAll("${version}", mcVersion).replace("${modloader}", "neoforge").replace("${modloader_version}", neoForgeVersion).replace("${java}", await getJava(mcVersion)) } else { const template = await fs.readFile(path.join(tempFolder, "forge.test.ts.template"), { encoding: "utf-8" }) - result = template.replaceAll("${version}", mcVersion).replace("${forge_version}", neoForgeVersion) + result = template.replaceAll("${version}", mcVersion).replace("${modloader}", "neoforge").replace("${modloader_version}", neoForgeVersion) } await fs.writeFile(path.join(tempFolder, `modloaders/neoforge/neoforge-${mcVersion}-${neoForgeVersion}.test.ts`), result) console.log(`Done neoforge ${neoForgeVersion}`)