MelonLoader Improvements (#1539)

ebkr · Nov 11, 2024 · 78a0402 · 78a0402
1 parent 265781c
commit 78a0402
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/r2mm/installing/profile_installers/ModLoaderVariantRecord.ts b/src/r2mm/installing/profile_installers/ModLoaderVariantRecord.ts
@@ -124,7 +124,7 @@ const VARIANTS = {
     Aloft: MODLOADER_PACKAGES,
     COTL: MODLOADER_PACKAGES,
     ChronoArk: MODLOADER_PACKAGES,
-    BONELAB: [new ModLoaderPackageMapping("LavaGang-MelonLoader", "", PackageLoader.MELON_LOADER, new VersionNumber("0.5.7"))],
+    BONELAB: [new ModLoaderPackageMapping("LavaGang-MelonLoader", "", PackageLoader.MELON_LOADER)],
     TromboneChamp: MODLOADER_PACKAGES,
     RogueGenesia: MODLOADER_PACKAGES,
     AcrossTheObelisk: MODLOADER_PACKAGES,

diff --git a/src/r2mm/launching/instructions/instructions/loader/MelonLoaderGameInstructions.ts b/src/r2mm/launching/instructions/instructions/loader/MelonLoaderGameInstructions.ts
@@ -9,9 +9,12 @@ export default class MelonLoaderGameInstructions extends GameInstructionGenerato
 
     public async generate(game: Game, profile: Profile): Promise<GameInstruction> {
         let moddedParameters = `--melonloader.basedir "${DynamicGameInstruction.PROFILE_DIRECTORY}"`;
-        if (!await FsProvider.instance.exists(profile.joinToProfilePath('MelonLoader', 'Managed', 'Assembly-CSharp.dll'))) {
-            console.log("Regenerating AGF")
-           moddedParameters += " --melonloader.agfregenerate"
+
+        const mlZeroPointFiveAssemblyExists = await FsProvider.instance.exists(profile.joinToProfilePath('MelonLoader', 'Managed', 'Assembly-CSharp.dll'));
+        const mlZeroPointSixAssemblyExists = await FsProvider.instance.exists(profile.joinToProfilePath('MelonLoader', 'Il2CppAssemblies', 'Assembly-CSharp.dll'));
+
+        if (!mlZeroPointFiveAssemblyExists && !mlZeroPointSixAssemblyExists) {
+            moddedParameters += ' --melonloader.agfregenerate';
         }
         return {
             moddedParameters: moddedParameters,