Merge remote-tracking branch 'upstream/master'

.github/workflows/build.yml

@@ -180,7 +180,7 @@ jobs:
           xcopy BaseLibs\net6 Output\Debug\x64\MelonLoader\net6\ /E /H /Y
           echo.
           echo Copying Dobby x64...
-          xcopy BaseLibs\dobby_x64.dll Output\Debug\x64\dobby.dll*
+          xcopy BaseLibs\dobby_x64.dll Output\Debug\x64\MelonLoader\Dependencies\dobby.dll*
           echo.
           echo Copying documentation files...
           copy NOTICE.txt Output\Debug\x64
@@ -189,6 +189,8 @@ jobs:
           copy LICENSE.md Output\Debug\x64\MelonLoader\Documentation\
           copy NOTICE.txt Output\Debug\x64\MelonLoader\Documentation\
           copy README.md Output\Debug\x64\MelonLoader\Documentation\
+          del Output\Debug\x64\MelonLoader\net6\MelonStartScreen.dll
+          del Output\Debug\x64\MelonLoader\net6\MelonStartScreen.deps.json
       - uses: actions/upload-artifact@v4
         name: Upload Zip | Windows - x64
         with:
@@ -224,7 +226,7 @@ jobs:
           xcopy BaseLibs\net6 Output\Debug\x86\MelonLoader\net6\ /E /H /Y
           echo.
           echo Copying Dobby x86...
-          xcopy BaseLibs\dobby_x86.dll Output\Debug\x86\dobby.dll*
+          xcopy BaseLibs\dobby_x86.dll Output\Debug\x86\MelonLoader\Dependencies\dobby.dll*
           echo.
           echo Copying documentation files...
           copy NOTICE.txt Output\Debug\x86
@@ -233,6 +235,8 @@ jobs:
           copy LICENSE.md Output\Debug\x86\MelonLoader\Documentation\
           copy NOTICE.txt Output\Debug\x86\MelonLoader\Documentation\
           copy README.md Output\Debug\x86\MelonLoader\Documentation\
+          del Output\Debug\x86\MelonLoader\net6\MelonStartScreen.dll
+          del Output\Debug\x86\MelonLoader\net6\MelonStartScreen.deps.json
       - uses: actions/upload-artifact@v4
         name: Upload Zip | Windows - x86
         with:
@@ -268,7 +272,7 @@ jobs:
           xcopy BaseLibs\net6 Output\Release\x64\MelonLoader\net6\ /E /H /Y
           echo.
           echo Copying Dobby x64...
-          xcopy BaseLibs\dobby_x64.dll Output\Release\x64\dobby.dll*
+          xcopy BaseLibs\dobby_x64.dll Output\Release\x64\MelonLoader\Dependencies\dobby.dll*
           echo. 
           echo Copying documentation files...
           copy NOTICE.txt Output\Release\x64
@@ -277,6 +281,8 @@ jobs:
           copy LICENSE.md Output\Release\x64\MelonLoader\Documentation\
           copy NOTICE.txt Output\Release\x64\MelonLoader\Documentation\
           copy README.md Output\Release\x64\MelonLoader\Documentation\
+          del Output\Release\x64\MelonLoader\net6\MelonStartScreen.dll
+          del Output\Release\x64\MelonLoader\net6\MelonStartScreen.deps.json
       - uses: actions/upload-artifact@v4
         name: Upload Zip | Windows - x64
         with:
@@ -312,7 +318,7 @@ jobs:
           xcopy BaseLibs\net6 Output\Release\x86\MelonLoader\net6\ /E /H /Y
           echo.
           echo Copying Dobby x86...
-          xcopy BaseLibs\dobby_x86.dll Output\Release\x86\dobby.dll*
+          xcopy BaseLibs\dobby_x86.dll Output\Release\x86\MelonLoader\Dependencies\dobby.dll*
           echo.
           echo Copying documentation files...
           copy NOTICE.txt Output\Release\x86
@@ -321,6 +327,8 @@ jobs:
           copy LICENSE.md Output\Release\x86\MelonLoader\Documentation\
           copy NOTICE.txt Output\Release\x86\MelonLoader\Documentation\
           copy README.md Output\Release\x86\MelonLoader\Documentation\
+          del Output\Release\x86\MelonLoader\net6\MelonStartScreen.dll
+          del Output\Release\x86\MelonLoader\net6\MelonStartScreen.deps.json
       - uses: actions/upload-artifact@v4
         name: Upload Zip | Windows - x86
         with:
@@ -362,6 +370,8 @@ jobs:
           copy LICENSE.md Output\Debug\x64\MelonLoader\Documentation\
           copy NOTICE.txt Output\Debug\x64\MelonLoader\Documentation\
           copy README.md Output\Debug\x64\MelonLoader\Documentation\
+          del Output\Debug\x64\MelonLoader\net6\MelonStartScreen.dll
+          del Output\Debug\x64\MelonLoader\net6\MelonStartScreen.deps.json
       - uses: actions/upload-artifact@v4
         name: Upload Zip | Linux - x64
         with:
@@ -403,6 +413,8 @@ jobs:
           copy LICENSE.md Output\Release\x64\MelonLoader\Documentation\
           copy NOTICE.txt Output\Release\x64\MelonLoader\Documentation\
           copy README.md Output\Release\x64\MelonLoader\Documentation\
+          del Output\Release\x64\MelonLoader\net6\MelonStartScreen.dll
+          del Output\Release\x64\MelonLoader\net6\MelonStartScreen.deps.json
       - uses: actions/upload-artifact@v4
         name: Upload Zip | Linux - x64
         with:

.github/workflows/nuget.yml

@@ -23,4 +23,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: MelonLoaderNuGetPackage
-          path: MelonLoader/Output/Release/MelonLoader/LavaGang.MelonLoader.0.6.5.nupkg
+          path: MelonLoader/Output/Release/MelonLoader/LavaGang.MelonLoader.0.6.6.nupkg

.github/workflows/stale.yml

@@ -0,0 +1,41 @@
+# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
+#
+# You can adjust the behavior by modifying this file.
+# For more information, see:
+# https://github.com/actions/stale
+name: Close inactive issues
+
+on:
+  schedule:
+    - cron: '4 20 * * *'
+  workflow_dispatch:
+
+permissions:
+  issues: write
+  pull-requests: write
+
+concurrency:
+  group: stale
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/stale@main
+      with:
+        days-before-issue-stale: 120
+        days-before-issue-close: 14
+        stale-issue-message: "This issue is stale because it has been open for 4 months with no activity. If this is still an issue then please leave a comment, or else this will close in 2 weeks."
+        close-issue-message: "This issue was closed because it has been 2 weeks since being marked as stale."
+        days-before-pr-stale: -1
+        days-before-pr-close: -1
+        exempt-issue-labels: "Work-in-Progress,Planned,Improvement"
+        operations-per-run: 100
+  lock:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/lock-threads@v5.0.1
+        with:
+          issue-inactive-days: '365'
+          issue-lock-reason: 'resolved'
+          process-only: 'issues'

CHANGELOG.md

@@ -1,5 +1,6 @@
 | Versions: |
 | - |
+| [v0.6.6](#v066) |
 | [v0.6.5](#v065) |
 | [v0.6.4](#v064) |
 | [v0.6.3](#v063) |
@@ -37,6 +38,31 @@
 
 ---
 
+### v0.6.6
+
+1. Updated Il2CppInterop to 1.4.6-ci.579
+2. Implemented a RegisterTypeInIl2CppWithInterfaces attribute
+3. Implemented Recursive Melon Folders with extended UserLib Resolving
+4. Reimplemented NetFramework Variant of Cpp2IL as fallback
+5. Standardized Assembly Searching and Resolving to work on both Mono and Il2Cpp Games
+6. Temporarily removed Start Screen for being broken in most cases
+7. Modified Command-Line Argument Logging to show Internal Arguments Only
+8. Added UserLibs folders to Native Library Search Directories
+9. Moved `dobby.dll` to `MelonLoader\Dependencies`
+10. Moved Assembly Resolver Related Classes to `MelonLoader.Resolver` Namespace
+11. Moved `MonoLibrary` class to `MelonLoader.Utils` Namespace
+12. Removed Useless TODO Warning from Il2CppAssemblyGenerator
+13. Removed EOS Compatibility Layer for being Unneeded
+14. Fixed Regression with LemonMD5, LemonSHA256, and LemonSHA512
+15. Fixed an issue with older Cpp2IL versions causing a download failure
+16. Fixed an issue with Il2CppInterop not properly logging Trampoline Exceptions
+17. Fixed an issue with Il2Cpp Class Injection Attributes causing exceptions to be thrown on Mono games
+18. Fixed an issue with the Bootstrap not reading `--melonloader.basedir` correctly
+19. Fixed an issue with Loading `dobby.dll` in some rare cases
+20. Fixed an issue with Compatibility Layers getting Garbage Collected while still in use
+
+---
+
 ### v0.6.5
 
 1. Updated Il2CppInterop to 1.4.6-ci.545

Dependencies/CompatibilityLayers/IPA/Module.cs

@@ -2,11 +2,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using MelonLoader.MonoInternals;
 using IllusionPlugin;
-using System.IO;
 using IllusionInjector;
 using MelonLoader.Modules;
+using MelonLoader.Resolver;
 
 namespace MelonLoader.CompatibilityLayers
 {
@@ -26,7 +25,7 @@ public override void OnInitialize()
 			};
 			Assembly base_assembly = typeof(IPA_Module).Assembly;
 			foreach (string assemblyName in assembly_list)
-				MonoResolveManager.GetAssemblyResolveInfo(assemblyName).Override = base_assembly;
+                MelonAssemblyResolver.GetAssemblyResolveInfo(assemblyName).Override = base_assembly;
 
 			MelonAssembly.CustomMelonResolvers += Resolve;
 		}

Dependencies/CompatibilityLayers/Muse_Dash_Mono/Module.cs

@@ -3,8 +3,8 @@
 using System.Linq;
 using System.Reflection;
 using MelonLoader.Modules;
-using MelonLoader.MonoInternals;
 using ModHelper;
+using MelonLoader.Resolver;
 
 namespace MelonLoader.CompatibilityLayers
 {
@@ -24,7 +24,7 @@ public override void OnInitialize()
             };
             Assembly base_assembly = typeof(Muse_Dash_Mono_Module).Assembly;
             foreach (string assemblyName in assembly_list)
-                MonoResolveManager.GetAssemblyResolveInfo(assemblyName).Override = base_assembly;
+                MelonAssemblyResolver.GetAssemblyResolveInfo(assemblyName).Override = base_assembly;
 
             MelonAssembly.CustomMelonResolvers += Resolve;
         }

Dependencies/Il2CppAssemblyGenerator/Core.cs

@@ -7,6 +7,7 @@
 using System.Reflection;
 using JNISharp.NativeInterface;
 using MelonLoader.Il2CppAssemblyGenerator.Packages;
+using MelonLoader.Il2CppAssemblyGenerator.Packages.Models;
 using MelonLoader.Modules;
 using MelonLoader.Utils;
 
@@ -20,7 +21,7 @@ internal class Core : MelonModule
 
         internal static HttpClient webClient = null;
 
-        internal static Packages.Cpp2IL cpp2il = null;
+        internal static ExecutablePackage cpp2il = null;
         internal static Cpp2IL_StrippedCodeRegSupport cpp2il_scrs = null;
 
         internal static Packages.Il2CppInterop il2cppinterop = null;
@@ -58,7 +59,13 @@ private static int Run()
             if (!MelonLaunchOptions.Il2CppAssemblyGenerator.OfflineMode)
                 RemoteAPI.Contact();
 
-            cpp2il = new Packages.Cpp2IL();
+            Cpp2IL cpp2IL_netcore = new Cpp2IL();
+            if (MelonUtils.IsWindows
+                && (cpp2IL_netcore.VersionSem < Cpp2IL.NetCoreMinVersion))
+                cpp2il = new Cpp2IL_NetFramework();
+            else
+                cpp2il = cpp2IL_netcore;
+
             //cpp2il_scrs = new Cpp2IL_StrippedCodeRegSupport(cpp2il);
 
             il2cppinterop = new Packages.Il2CppInterop();

Dependencies/Il2CppAssemblyGenerator/Packages/Cpp2IL.cs

@@ -21,9 +21,8 @@ namespace MelonLoader.Il2CppAssemblyGenerator.Packages
 {
     internal class Cpp2IL : Models.ExecutablePackage
     {
-        internal static SemVersion NetCoreMinVersion = SemVersion.Parse("2022.1.0-pre-release.17");
-        private static SemVersion NewExecutionMinVersion = SemVersion.Parse("2022.0.999");
-        private SemVersion VersionSem;
+        internal static SemVersion NetCoreMinVersion = SemVersion.Parse("2022.1.0-pre-release.18");
+        internal SemVersion VersionSem;
         private string BaseFolder;
 
         private static string ReleaseName =>