From 8a4d418ffb28149787516551f5eb0639bd2ae52f Mon Sep 17 00:00:00 2001 From: Sinai <49360850+sinai-dev@users.noreply.github.com> Date: Tue, 12 Apr 2022 02:36:12 +1000 Subject: [PATCH] Finalize 4.7.0 release, cleanups --- README.md | 1 - build.ps1 | 12 ++++++------ src/Config/ConfigManager.cs | 1 - src/ExplorerCore.cs | 8 ++++---- src/UnityExplorer.csproj | 14 +++++++------- 5 files changed, 17 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index e2d5472..279f305 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,6 @@ 1. Unzip the release file into a folder 2. Take the `plugins/sinai-dev-UnityExplorer` folder and place it in `BepInEx/plugins/` -3. ⚠️ **Important**: For IL2CPP games, you must set `Il2CppDumperType = Cpp2IL` in the `BepInEx.cfg` file. Note: BepInEx 6 is obtainable via [builds.bepinex.dev](https://builds.bepinex.dev/projects/bepinex_be) diff --git a/build.ps1 b/build.ps1 index 10a561b..a72d144 100644 --- a/build.ps1 +++ b/build.ps1 @@ -1,11 +1,11 @@ # MelonLoader IL2CPP (net6) dotnet build src\UnityExplorer.sln -c Release_ML_Cpp_net6 # (cleanup and move files) -$Path = "Release\UnityExplorer.MelonLoader.Il2Cpp.0.6" -Remove-Item $Path\UnityExplorer.ML.IL2CPP.deps.json +$Path = "Release\UnityExplorer.MelonLoader.IL2CPP.net6preview" +Remove-Item $Path\UnityExplorer.ML.IL2CPP.net6preview.deps.json Remove-Item $Path\Tomlet.dll New-Item -Path "$Path" -Name "Mods" -ItemType "directory" -Force -Move-Item -Path $Path\UnityExplorer.ML.IL2CPP.dll -Destination $Path\Mods -Force +Move-Item -Path $Path\UnityExplorer.ML.IL2CPP.net6preview.dll -Destination $Path\Mods -Force New-Item -Path "$Path" -Name "UserLibs" -ItemType "directory" -Force Move-Item -Path $Path\mcs.dll -Destination $Path\UserLibs -Force Move-Item -Path $Path\UniverseLib.IL2CPP.dll -Destination $Path\UserLibs -Force @@ -15,7 +15,7 @@ Compress-Archive -Path $Path\* -CompressionLevel Fastest -DestinationPath $Path\ # MelonLoader IL2CPP (net472) dotnet build src\UnityExplorer.sln -c Release_ML_Cpp_net472 # (cleanup and move files) -$Path = "Release\UnityExplorer.MelonLoader.Il2Cpp.0.5" +$Path = "Release\UnityExplorer.MelonLoader.IL2CPP" Remove-Item $Path\Tomlet.dll New-Item -Path "$Path" -Name "Mods" -ItemType "directory" -Force Move-Item -Path $Path\UnityExplorer.ML.IL2CPP.dll -Destination $Path\Mods -Force @@ -41,7 +41,7 @@ Compress-Archive -Path $Path\* -CompressionLevel Fastest -DestinationPath $Path\ # BepInEx IL2CPP dotnet build src\UnityExplorer.sln -c Release_BIE_Cpp # (cleanup and move files) -$Path = "Release\UnityExplorer.BepInEx.Il2Cpp" +$Path = "Release\UnityExplorer.BepInEx.IL2CPP" New-Item -Path "$Path" -Name "plugins" -ItemType "directory" -Force New-Item -Path "$Path" -Name "plugins\sinai-dev-UnityExplorer" -ItemType "directory" -Force Move-Item -Path $Path\UnityExplorer.BIE.IL2CPP.dll -Destination $Path\plugins\sinai-dev-UnityExplorer -Force @@ -84,7 +84,7 @@ Compress-Archive -Path $Path\* -CompressionLevel Fastest -DestinationPath $Path\ # Standalone IL2CPP dotnet build src\UnityExplorer.sln -c Release_STANDALONE_Cpp -$Path = "Release\UnityExplorer.Standalone.Il2Cpp" +$Path = "Release\UnityExplorer.Standalone.IL2CPP" Compress-Archive -Path $Path\* -CompressionLevel Fastest -DestinationPath $Path\..\UnityExplorer.Standalone.IL2CPP.zip -Force # Editor (mono) diff --git a/src/Config/ConfigManager.cs b/src/Config/ConfigManager.cs index 63ddd83..1c68a81 100644 --- a/src/Config/ConfigManager.cs +++ b/src/Config/ConfigManager.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Globalization; using System.IO; using System.Linq; -using System.Runtime.InteropServices; using System.Text; using UnityEngine; using UnityExplorer.UI; diff --git a/src/ExplorerCore.cs b/src/ExplorerCore.cs index 287cd8f..189437e 100644 --- a/src/ExplorerCore.cs +++ b/src/ExplorerCore.cs @@ -41,16 +41,16 @@ namespace UnityExplorer Directory.CreateDirectory(ExplorerFolder); ConfigManager.Init(Loader.ConfigHandler); - UERuntimeHelper.Init(); - ExplorerBehaviour.Setup(); - UnityCrashPrevention.Init(); - Universe.Init(ConfigManager.Startup_Delay_Time.Value, LateInit, Log, new() { Disable_EventSystem_Override = ConfigManager.Disable_EventSystem_Override.Value, Force_Unlock_Mouse = ConfigManager.Force_Unlock_Mouse.Value, Unhollowed_Modules_Folder = loader.UnhollowedModulesFolder }); + + UERuntimeHelper.Init(); + ExplorerBehaviour.Setup(); + UnityCrashPrevention.Init(); } // Do a delayed setup so that objects aren't destroyed instantly. diff --git a/src/UnityExplorer.csproj b/src/UnityExplorer.csproj index e8e2c34..6d0fcbe 100644 --- a/src/UnityExplorer.csproj +++ b/src/UnityExplorer.csproj @@ -17,14 +17,14 @@ net6 - ..\Release\UnityExplorer.MelonLoader.Il2Cpp.0.6\ + ..\Release\UnityExplorer.MelonLoader.IL2CPP.net6preview\ CPP,ML - UnityExplorer.ML.IL2CPP + UnityExplorer.ML.IL2CPP.net6preview net472 - ..\Release\UnityExplorer.MelonLoader.Il2Cpp.0.5\ + ..\Release\UnityExplorer.MelonLoader.IL2CPP\ CPP,ML UnityExplorer.ML.IL2CPP @@ -38,7 +38,7 @@ net472 - ..\Release\UnityExplorer.BepInEx.Il2Cpp\ + ..\Release\UnityExplorer.BepInEx.IL2CPP\ CPP,BIE,BIE6 UnityExplorer.BIE.IL2CPP @@ -66,7 +66,7 @@ net472 - ..\Release\UnityExplorer.Standalone.Il2Cpp\ + ..\Release\UnityExplorer.Standalone.IL2CPP\ CPP,STANDALONE UnityExplorer.STANDALONE.IL2CPP @@ -79,11 +79,11 @@ - + - +