Extended Mono and Il2Cpp Loading to its own Modules

LavaGang · Dec 5, 2023 · 6f3af42 · 6f3af42
1 parent 4b1a698
commit 6f3af42
Show file tree

Hide file tree

Showing 10 changed files with 74 additions and 36 deletions.
diff --git a/MelonLoader/MelonLoader.Mono/MelonLoader.Mono.csproj b/MelonLoader/MelonLoader.Mono/MelonLoader.Mono.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <RootNamespace>MelonLoader.Mono</RootNamespace>
+        <TargetFramework>net6</TargetFramework>
+        <LangVersion>Latest</LangVersion>
+        <OutputPath>$(SolutionDir)Output\$(Configuration)\MelonLoader\</OutputPath>
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <DebugType>embedded</DebugType>
+    </PropertyGroup>
+    <ItemGroup>
+      <ProjectReference Include="..\MelonLoader.Bootstrap\MelonLoader.Bootstrap.csproj" Private="false" ExcludeAssets="runtime"  />
+      <ProjectReference Include="..\MelonLoader.Shared\MelonLoader.Shared.csproj" Private="false" ExcludeAssets="runtime" />
+    </ItemGroup>
+</Project>
diff --git a/...ity/Unity.Bootstrap/Mono/BootstrapMono.cs → MelonLoader/MelonLoader.Mono/MonoLoader.cs b/...ity/Unity.Bootstrap/Mono/BootstrapMono.cs → MelonLoader/MelonLoader.Mono/MonoLoader.cs
@@ -1,15 +1,11 @@
 using System;
-using System.IO;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using MelonLoader.Bootstrap;
 using MelonLoader.Shared.NativeUtils;
 using MelonLoader.Shared.Utils;
 #pragma warning disable 0649
 
-namespace MelonLoader.Unity.Mono
+namespace MelonLoader.Mono
 {
-    internal unsafe static class BootstrapMono
+    public unsafe static class MonoLoader
     {
         #region Private Members
 
@@ -24,7 +20,7 @@ internal unsafe static class BootstrapMono
 
         #region Bootstrap
 
-        internal unsafe static void Startup(MonoRuntimeInfo runtimeInfo)
+        public unsafe static void Startup(MonoRuntimeInfo runtimeInfo)
         {
             // Apply the information
             monoRuntimeInfo = runtimeInfo;
@@ -33,14 +29,10 @@ internal unsafe static void Startup(MonoRuntimeInfo runtimeInfo)
             if (monoRuntimeInfo == null
                 || string.IsNullOrEmpty(monoRuntimeInfo.FilePath))
             {
-                Assertion.ThrowInternalFailure($"Failed to find Mono or MonoBleedingEdge Library!");
+                Assertion.ThrowInternalFailure($"Failed to find {runtimeInfo.Variant} Library!");
                 return;
             }
 
-
-            // Log Engine Variant
-            MelonLogger.Msg($"Engine Variant: {monoRuntimeInfo.Variant}");
-
             // Check if there is a Posix Helper included with the Mono variant library
             if (!string.IsNullOrEmpty(monoRuntimeInfo.PosixPath))
             {

diff --git a/...y/Unity.Bootstrap/Mono/MonoRuntimeInfo.cs → ...oader/MelonLoader.Mono/MonoRuntimeInfo.cs b/...y/Unity.Bootstrap/Mono/MonoRuntimeInfo.cs → ...oader/MelonLoader.Mono/MonoRuntimeInfo.cs
@@ -1,4 +1,4 @@
-namespace MelonLoader.Unity.Mono
+namespace MelonLoader.Mono
 {
     public class MonoRuntimeInfo
     {

diff --git a/MelonLoader/MelonLoader.sln b/MelonLoader/MelonLoader.sln
@@ -19,6 +19,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Godot.Bootstrap", "Modules\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Unity.Bootstrap", "Modules\Unity\Unity.Bootstrap\Unity.Bootstrap.csproj", "{75F7B154-10E0-484F-A463-16376FFA5553}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MelonLoader.Mono", "MelonLoader.Mono\MelonLoader.Mono.csproj", "{712BC5B3-766A-4B44-9BF4-1012BE63D6F6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Unity.Il2Cpp", "Modules\Unity\Unity.Il2Cpp\Unity.Il2Cpp.csproj", "{9EBD236C-42FC-4E98-8388-E763BA46FD10}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -45,6 +49,14 @@ Global
 		{75F7B154-10E0-484F-A463-16376FFA5553}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{75F7B154-10E0-484F-A463-16376FFA5553}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{75F7B154-10E0-484F-A463-16376FFA5553}.Release|Any CPU.Build.0 = Release|Any CPU
+		{712BC5B3-766A-4B44-9BF4-1012BE63D6F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{712BC5B3-766A-4B44-9BF4-1012BE63D6F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{712BC5B3-766A-4B44-9BF4-1012BE63D6F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{712BC5B3-766A-4B44-9BF4-1012BE63D6F6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9EBD236C-42FC-4E98-8388-E763BA46FD10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9EBD236C-42FC-4E98-8388-E763BA46FD10}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9EBD236C-42FC-4E98-8388-E763BA46FD10}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9EBD236C-42FC-4E98-8388-E763BA46FD10}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -54,6 +66,7 @@ Global
 		{3E7F5C09-221B-4492-9BA0-2D1ED9BEC58C} = {716CE800-E309-4104-ACA3-867BB8BF4FB0}
 		{483E5B56-7308-4DAD-BF90-B27DC97116D0} = {A5293DFE-1E8A-4933-B3D6-F8B06D995A23}
 		{75F7B154-10E0-484F-A463-16376FFA5553} = {3E7F5C09-221B-4492-9BA0-2D1ED9BEC58C}
+		{9EBD236C-42FC-4E98-8388-E763BA46FD10} = {3E7F5C09-221B-4492-9BA0-2D1ED9BEC58C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4490CB48-16CD-4D0A-858D-1484CB9DED02}

diff --git a/MelonLoader/Modules/Godot/Godot.Bootstrap/Godot.Bootstrap.csproj b/MelonLoader/Modules/Godot/Godot.Bootstrap/Godot.Bootstrap.csproj
@@ -3,13 +3,10 @@
         <RootNamespace>MelonLoader.Godot</RootNamespace>
         <TargetFramework>net6</TargetFramework>
         <LangVersion>Latest</LangVersion>
-        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <OutputPath>$(SolutionDir)Output\$(Configuration)\MelonLoader\Modules\Godot\</OutputPath>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <DebugType>embedded</DebugType>
-        <PublishTrimmed>false</PublishTrimmed>
     </PropertyGroup>
     <ItemGroup>
       <ProjectReference Include="..\..\..\MelonLoader.Shared\MelonLoader.Shared.csproj" Private="false" ExcludeAssets="runtime"/>

diff --git a/MelonLoader/Modules/Unity/Unity.Bootstrap/Bootstrap.cs b/MelonLoader/Modules/Unity/Unity.Bootstrap/Bootstrap.cs
@@ -1,6 +1,8 @@
 using System.IO;
+using MelonLoader.Mono;
 using MelonLoader.Shared.Interfaces;
 using MelonLoader.Shared.Utils;
+using MelonLoader.Unity.Il2Cpp;
 
 namespace MelonLoader.Unity
 {
@@ -40,12 +42,21 @@ public void Startup()
             // Check if GameAssembly exists
             string gameAssemblyPath = Path.Combine(MelonEnvironment.GameRootDirectory, gameAssemblyName);
             if (File.Exists(gameAssemblyPath))
-                Il2Cpp.BootstrapIl2Cpp.Startup(gameAssemblyPath); // Start Il2Cpp Support
+            {
+                // Start Il2Cpp Support
+                MelonLogger.Msg("Engine Variant: Il2Cpp");
+                Il2CppLoader.Startup(gameAssemblyPath); 
+            }
             else
-                Mono.BootstrapMono.Startup(GetMonoRuntimeInfo()); // Start Mono Support
+            { 
+                // Start Mono Support
+                MonoRuntimeInfo runtimeInfo = GetMonoRuntimeInfo();
+                MelonLogger.Msg($"Engine Variant: {runtimeInfo.Variant}");
+                MonoLoader.Startup(runtimeInfo);
+            }
         }
 
-        internal static Mono.MonoRuntimeInfo GetMonoRuntimeInfo()
+        internal static MonoRuntimeInfo GetMonoRuntimeInfo()
         {
             // Folders the Mono folders might be located in
             string[] directoriesToSearch = new string[]

diff --git a/MelonLoader/Modules/Unity/Unity.Bootstrap/Il2Cpp/BootstrapIl2Cpp.cs b/MelonLoader/Modules/Unity/Unity.Bootstrap/Il2Cpp/BootstrapIl2Cpp.cs
diff --git a/MelonLoader/Modules/Unity/Unity.Bootstrap/Unity.Bootstrap.csproj b/MelonLoader/Modules/Unity/Unity.Bootstrap/Unity.Bootstrap.csproj
@@ -3,16 +3,15 @@
         <RootNamespace>MelonLoader.Unity</RootNamespace>
         <TargetFramework>net6</TargetFramework>
         <LangVersion>Latest</LangVersion>
-        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <OutputPath>$(SolutionDir)Output\$(Configuration)\MelonLoader\Modules\Unity\</OutputPath>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <DebugType>embedded</DebugType>
-        <PublishTrimmed>false</PublishTrimmed>
     </PropertyGroup>
     <ItemGroup>
-      <ProjectReference Include="..\..\..\MelonLoader.Bootstrap\MelonLoader.Bootstrap.csproj" Private="false" ExcludeAssets="runtime"  />
+      <ProjectReference Include="..\..\..\MelonLoader.Bootstrap\MelonLoader.Bootstrap.csproj" Private="false" ExcludeAssets="runtime" />
+      <ProjectReference Include="..\..\..\MelonLoader.Mono\MelonLoader.Mono.csproj" />
       <ProjectReference Include="..\..\..\MelonLoader.Shared\MelonLoader.Shared.csproj" Private="false" ExcludeAssets="runtime" />
+      <ProjectReference Include="..\Unity.Il2Cpp\Unity.Il2Cpp.csproj" />
     </ItemGroup>
 </Project>
diff --git a/MelonLoader/Modules/Unity/Unity.Il2Cpp/Il2CppLoader.cs b/MelonLoader/Modules/Unity/Unity.Il2Cpp/Il2CppLoader.cs
@@ -0,0 +1,10 @@
+namespace MelonLoader.Unity.Il2Cpp
+{
+    public static class Il2CppLoader
+    {
+        public static void Startup(string gameAssemblyPath)
+        {
+
+        }
+    }
+}
diff --git a/MelonLoader/Modules/Unity/Unity.Il2Cpp/Unity.Il2Cpp.csproj b/MelonLoader/Modules/Unity/Unity.Il2Cpp/Unity.Il2Cpp.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <RootNamespace>MelonLoader.Unity.Il2Cpp</RootNamespace>
+        <TargetFramework>net6</TargetFramework>
+        <LangVersion>Latest</LangVersion>
+        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+        <OutputPath>$(SolutionDir)Output\$(Configuration)\MelonLoader\Modules\Unity\</OutputPath>
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <DebugType>embedded</DebugType>
+    </PropertyGroup>
+    <ItemGroup>
+      <ProjectReference Include="..\..\..\MelonLoader.Bootstrap\MelonLoader.Bootstrap.csproj" Private="false" ExcludeAssets="runtime" />
+      <ProjectReference Include="..\..\..\MelonLoader.Shared\MelonLoader.Shared.csproj" Private="false" ExcludeAssets="runtime" />
+    </ItemGroup>
+</Project>