Skip to content

Fallback to existing Il2Cpp assemblies when generation fails #1153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Sim-hu wants to merge 1 commit into from
+17 −3
Closed

Fallback to existing Il2Cpp assemblies when generation fails #1153

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions Dependencies/Il2CppAssemblyGenerator/Core.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,14 @@ private static int Run()
if (!cpp2il.Execute())
{
cpp2il.Cleanup();
return 1;
return TryContinueWithExistingAssemblies();
}

if (!il2cppinterop.Execute())
{
cpp2il.Cleanup();
il2cppinterop.Cleanup();
return 1;
return TryContinueWithExistingAssemblies();
}

OldFiles_Cleanup();
Expand All @@ -133,6 +133,20 @@ private static int Run()
return 0;
}

private static int TryContinueWithExistingAssemblies()
{
if (LoaderConfig.Current.UnityEngine.ForceRegeneration)
return 1;

if (!Directory.Exists(MelonEnvironment.Il2CppAssembliesDirectory)
|| Directory.GetFiles(MelonEnvironment.Il2CppAssembliesDirectory, "*.dll").Length <= 0)
return 1;

Logger.Warning("Assembly Generation failed, but existing Il2Cpp assemblies were found.");
Logger.Warning("Continuing with the existing assemblies. Mods may be incompatible until generation succeeds.");
return 0;
}

private static void OldFiles_Cleanup()
{
if (Config.Values.OldFiles.Count <= 0)
Expand Down Expand Up @@ -169,4 +183,4 @@ private static void OldFiles_LAM()
Config.Save();
}
}
}
}