Skip to content

Commit

Permalink
Handful of Bugfixes
Browse files Browse the repository at this point in the history
Moved MonoMod.HookGen to its own Plugin
Fixed an issue with failing to resolve MonoMod dependencies for Plugins
Reverted the removal of opposite runtime dependencies
  • Loading branch information
HerpDerpinstine committed Sep 4, 2024
1 parent 01826d9 commit 442615a
Show file tree
Hide file tree
Showing 12 changed files with 25 additions and 399 deletions.
23 changes: 11 additions & 12 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,23 +41,22 @@

1. Replaced [BepInEx/Il2CppInterop](https://github.com/BepInEx/Il2CppInterop) with [ds5678/Il2CppInterop](https://github.com/ds5678/Il2CppInterop)
2. Updated Il2CppInterop to 1.5.4
3. Updated Cpp2IL to 2022.1.0-pre-release.17
3. Updated Cpp2IL to 2022.1.0-pre-release.18
4. Updated AsmResolver to 6.0.0-beta.1
5. Updated AssetRipper.VersionUtilities to 1.5.0
6. Updated AssetsTools.NET to 3.0.0
7. Implemented `--cpp2il.callanalyzer` launch option to enable Cpp2IL's CallAnalyzer processor
8. Implemented `--cpp2il.nativemethoddetector` launch option to enable Cpp2IL's NativeMethodDetector processor
9. Implemented MonoMod Hook Generator for Mono Games
10. Implemented several fixes for Il2CppInterop related issues
11. Implemented Cpp2IL's StrippedCodeRegSupport plugin
12. Fixed an accidental regression with LemonSHA256
13. Fixed an issue with Native logs using the wrong Colors
14. Fixed an issue with Preload module not replacing Mono libraries on Older Mono Games
15. Fixed an issue with MonoMod.HookGen failing to generate on stripped Mono Games
16. Fixed an issue with MonoMod DetourContext Disposal not working properly
17. Fixed an issue with Debugger Launch Option causing crashes
18. Fixed an issue with Console not having the Game Name and Version in the title
19. Fixed an issue with Sharing Violation during Log Initialization
9. Implemented several fixes for Il2CppInterop related issues
10. Implemented Cpp2IL's StrippedCodeRegSupport plugin
11. Fixed an accidental regression with LemonSHA256
12. Fixed an issue with Native logs using the wrong Colors
13. Fixed an issue with Preload module not replacing Mono libraries on Older Mono Games
14. Fixed an issue with MonoMod.HookGen failing to generate on stripped Mono Games
15. Fixed an issue with MonoMod DetourContext Disposal not working properly
16. Fixed an issue with Debugger Launch Option causing crashes
17. Fixed an issue with Console not having the Game Name and Version in the title
18. Fixed an issue with Sharing Violation during Log Initialization

---

Expand Down
17 changes: 0 additions & 17 deletions Dependencies/MelonStartScreen/ProgressParser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -93,23 +93,6 @@ public static bool SetModState(ModLoadStep step, ref string progressText, out fl

internal static readonly AverageStepDuration[] averageStepDurations = new AverageStepDuration[]
{
// MonoModHookGenerator
new AverageStepDuration(
@"[MonoMod.HookGen] Checking Assemblies",
100f,
@"MonoMod.HookGen - Checking Assemblies"
),
new AverageStepDuration(
@"[MonoMod.HookGen] Generating Assembly: .*",
1000f,
@"MonoMod.HookGen - Generating MMHOOK Assemblies..."
),
new AverageStepDuration(
@"[MonoMod.HookGen] Done!",
100f,
@"MonoMod.HookGen - Done!"
),

// Il2CppAssemblyGenerator
new AverageStepDuration(
@"Contacting RemoteAPI\.\.\.",
Expand Down
21 changes: 2 additions & 19 deletions MelonLoader/Core.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,6 @@
using System.IO;
using bHapticsLib;
using System.Threading;
using System.Drawing;


#if NET35
using MelonLoader.CompatibilityLayers;
#endif

#if NET6_0
using MelonLoader.CoreClrUtils;
#endif

#pragma warning disable IDE0051 // Prevent the IDE from complaining about private unreferenced methods

namespace MelonLoader
Expand Down Expand Up @@ -127,17 +116,11 @@ internal static int PreStart()

private static int PreSetup()
{
if (_success)
{
#if NET6_0

if (_success)
_success = Il2CppAssemblyGenerator.Run();

#else

MonoModHookGenerator.Run();
#endif
}

return _success ? 0 : 1;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Drawing;
using System.Text.RegularExpressions;

namespace MelonLoader.CompatibilityLayers
namespace MelonLoader.Fixes
{
internal static class Net20Compatibility
{
Expand Down
Loading

0 comments on commit 442615a

Please sign in to comment.