Temporarily removed Start Screen for being broken in most cases

Will make a return later. This is just currently causing more issues than its worth.
LavaGang · Sep 26, 2024 · bc67213 · bc67213
1 parent a8033a5
commit bc67213
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 12 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -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:
@@ -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:
@@ -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:
@@ -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:

diff --git a/MelonLoader/InternalUtils/MelonStartScreen.cs b/MelonLoader/InternalUtils/MelonStartScreen.cs
@@ -1,7 +1,7 @@
-using System.IO;
-using AssetRipper.VersionUtilities;
-using MelonLoader.Modules;
-using MelonLoader.Utils;
+//using System.IO;
+//using AssetRipper.VersionUtilities;
+//using MelonLoader.Modules;
+//using MelonLoader.Utils;
 
 namespace MelonLoader.InternalUtils
 {
@@ -10,20 +10,20 @@ internal class MelonStartScreen
         // Doesn't support Unity versions lower than 2017.2.0 (yet?)
         // Doesn't support Unity versions lower than 2018 (Crashing Issue)
         // Doesn't support Unity versions higher than to 2020.3.21 (Crashing Issue)
-        internal static readonly MelonModule.Info moduleInfo = new MelonModule.Info($"{MelonEnvironment.OurRuntimeDirectory}{Path.DirectorySeparatorChar}MelonStartScreen.dll"
-            , () => !MelonLaunchOptions.Core.StartScreen || UnityInformationHandler.EngineVersion < new UnityVersion(2018));
+        //internal static readonly MelonModule.Info moduleInfo = new MelonModule.Info($"{MelonEnvironment.OurRuntimeDirectory}{Path.DirectorySeparatorChar}MelonStartScreen.dll"
+        //    , () => !MelonLaunchOptions.Core.StartScreen || UnityInformationHandler.EngineVersion < new UnityVersion(2018));
 
         internal static int LoadAndRun(LemonFunc<int> functionToWaitForAsync)
         {
-            var module = MelonModule.Load(moduleInfo);
-            if (module == null)
+            //var module = MelonModule.Load(moduleInfo);
+            //if (module == null)
                 return functionToWaitForAsync();
 
-            var result = module.SendMessage("LoadAndRun", functionToWaitForAsync);
-            if (result is int resultCode)
-                return resultCode;
+            //var result = module.SendMessage("LoadAndRun", functionToWaitForAsync);
+            //if (result is int resultCode)
+            //    return resultCode;
 
-            return -1;
+            //return -1;
         }
     }
 }