Skip to content

V Rising 1.0 Fix #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Odjit wants to merge 2 commits into
base: vrising
Choose a base branch
from
Open

V Rising 1.0 Fix #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0bc5fae
Fixes
Odjit May 2, 2024
91a1059
Commenting out exception
Odjit May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 44 additions & 18 deletions BepInEx.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{12081C
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Unity", "Unity", "{BF8F4E07-3B89-4152-89F4-9EF9D4AAA1E0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BepInEx.Unity.Common", "Runtimes\Unity\BepInEx.Unity.Common\BepInEx.Unity.Common.csproj", "{C32E74A3-C0BD-42DE-9E2F-D033D496ACB9}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BepInEx.Unity.Common", "Runtimes\Unity\BepInEx.Unity.Common\BepInEx.Unity.Common.csproj", "{C32E74A3-C0BD-42DE-9E2F-D033D496ACB9}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IL2CPP", "IL2CPP", "{E4E75C18-4156-4213-A20C-8677EF6B5312}"
EndProject
Expand All @@ -49,22 +49,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Doorstop", "Doorstop", "{CE
Runtimes\Unity\Doorstop\run_bepinex_mono.sh = Runtimes\Unity\Doorstop\run_bepinex_mono.sh
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Build", "build\Build.csproj", "{0C38DDF2-EAAA-43FA-BA0A-985636AC6040}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Build", "build\Build.csproj", "{0C38DDF2-EAAA-43FA-BA0A-985636AC6040}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Il2CppInterop.Runtime", "..\Il2CppInterop\Il2CppInterop.Runtime\Il2CppInterop.Runtime.csproj", "{A329626D-805F-4F9F-885A-19A90A3D6BAD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Il2CppInterop.Generator", "..\Il2CppInterop\Il2CppInterop.Generator\Il2CppInterop.Generator.csproj", "{54ECDDC1-2D29-4BFD-8D70-AFE26BA7C2F3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Il2CppInterop.HarmonySupport", "..\Il2CppInterop\Il2CppInterop.HarmonySupport\Il2CppInterop.HarmonySupport.csproj", "{9D11712C-B669-46B7-B509-8D92108E65D1}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
BepInEx.NetLauncher.Shared\BepInEx.NetLauncher.Shared.projitems*{067bcc8c-fc25-4929-b4f4-c6a5a7496994}*SharedItemsImports = 13
BepInEx.NetLauncher.Shared\BepInEx.NetLauncher.Shared.projitems*{08083f40-98aa-4176-ba01-817c18c35c7f}*SharedItemsImports = 5
BepInEx.Shared\BepInEx.Shared.projitems*{08083f40-98aa-4176-ba01-817c18c35c7f}*SharedItemsImports = 5
BepInEx.Shared\BepInEx.Shared.projitems*{15f8bc38-a761-4f93-8903-1b531ac5d9f9}*SharedItemsImports = 5
BepInEx.Shared\BepInEx.Shared.projitems*{429d5f83-7fec-4d09-ab82-e868eb61af59}*SharedItemsImports = 5
BepInEx.NetLauncher.Shared\BepInEx.NetLauncher.Shared.projitems*{490b052b-7f23-4052-ad04-613856618901}*SharedItemsImports = 5
BepInEx.Shared\BepInEx.Shared.projitems*{490b052b-7f23-4052-ad04-613856618901}*SharedItemsImports = 5
BepInEx.Shared\BepInEx.Shared.projitems*{4ffba620-f5ed-47f9-b90c-dad1316fd9b9}*SharedItemsImports = 5
BepInEx.Shared\BepInEx.Shared.projitems*{5c7847fb-c16d-47bd-bb17-1045669f9aa7}*SharedItemsImports = 13
BepInEx.Shared\BepInEx.Shared.projitems*{d404c973-441d-48ed-b266-c21320ba0d87}*SharedItemsImports = 5
BepInEx.Shared\BepInEx.Shared.projitems*{eae9fae6-8011-45a3-8b6e-0c7f14210533}*SharedItemsImports = 5
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release_NetFramework|Any CPU = Release_NetFramework|Any CPU
Expand Down Expand Up @@ -147,25 +140,58 @@ Global
{0C38DDF2-EAAA-43FA-BA0A-985636AC6040}.Release_Unity|Any CPU.ActiveCfg = Debug|Any CPU
{0C38DDF2-EAAA-43FA-BA0A-985636AC6040}.Release_Unity|Any CPU.Build.0 = Debug|Any CPU
{0C38DDF2-EAAA-43FA-BA0A-985636AC6040}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A329626D-805F-4F9F-885A-19A90A3D6BAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A329626D-805F-4F9F-885A-19A90A3D6BAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A329626D-805F-4F9F-885A-19A90A3D6BAD}.Release_NetFramework|Any CPU.ActiveCfg = Release|Any CPU
{A329626D-805F-4F9F-885A-19A90A3D6BAD}.Release_NetFramework|Any CPU.Build.0 = Release|Any CPU
{A329626D-805F-4F9F-885A-19A90A3D6BAD}.Release_Unity|Any CPU.ActiveCfg = Release|Any CPU
{A329626D-805F-4F9F-885A-19A90A3D6BAD}.Release_Unity|Any CPU.Build.0 = Release|Any CPU
{A329626D-805F-4F9F-885A-19A90A3D6BAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A329626D-805F-4F9F-885A-19A90A3D6BAD}.Release|Any CPU.Build.0 = Release|Any CPU
{54ECDDC1-2D29-4BFD-8D70-AFE26BA7C2F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{54ECDDC1-2D29-4BFD-8D70-AFE26BA7C2F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{54ECDDC1-2D29-4BFD-8D70-AFE26BA7C2F3}.Release_NetFramework|Any CPU.ActiveCfg = Release|Any CPU
{54ECDDC1-2D29-4BFD-8D70-AFE26BA7C2F3}.Release_NetFramework|Any CPU.Build.0 = Release|Any CPU
{54ECDDC1-2D29-4BFD-8D70-AFE26BA7C2F3}.Release_Unity|Any CPU.ActiveCfg = Release|Any CPU
{54ECDDC1-2D29-4BFD-8D70-AFE26BA7C2F3}.Release_Unity|Any CPU.Build.0 = Release|Any CPU
{54ECDDC1-2D29-4BFD-8D70-AFE26BA7C2F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{54ECDDC1-2D29-4BFD-8D70-AFE26BA7C2F3}.Release|Any CPU.Build.0 = Release|Any CPU
{9D11712C-B669-46B7-B509-8D92108E65D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9D11712C-B669-46B7-B509-8D92108E65D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9D11712C-B669-46B7-B509-8D92108E65D1}.Release_NetFramework|Any CPU.ActiveCfg = Release|Any CPU
{9D11712C-B669-46B7-B509-8D92108E65D1}.Release_NetFramework|Any CPU.Build.0 = Release|Any CPU
{9D11712C-B669-46B7-B509-8D92108E65D1}.Release_Unity|Any CPU.ActiveCfg = Release|Any CPU
{9D11712C-B669-46B7-B509-8D92108E65D1}.Release_Unity|Any CPU.Build.0 = Release|Any CPU
{9D11712C-B669-46B7-B509-8D92108E65D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9D11712C-B669-46B7-B509-8D92108E65D1}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{EAE9FAE6-8011-45A3-8B6E-0C7F14210533} = {6E2DD21E-0854-4F4A-B925-D90E0016D03D}
{D404C973-441D-48ED-B266-C21320BA0D87} = {6E2DD21E-0854-4F4A-B925-D90E0016D03D}
{6E2DD21E-0854-4F4A-B925-D90E0016D03D} = {BF8F4E07-3B89-4152-89F4-9EF9D4AAA1E0}
{490B052B-7F23-4052-AD04-613856618901} = {6EC98884-A3DC-4828-85EF-5F10F7519429}
{429D5F83-7FEC-4D09-AB82-E868EB61AF59} = {E4E75C18-4156-4213-A20C-8677EF6B5312}
{68C57430-3E92-4B50-A9A5-208FE9CCD914} = {12081C35-76DF-450C-AC83-1E1CB84516AA}
{76EB1952-7826-471C-9CF3-815D094DA077} = {6EC98884-A3DC-4828-85EF-5F10F7519429}
{08083F40-98AA-4176-BA01-817C18C35C7F} = {6EC98884-A3DC-4828-85EF-5F10F7519429}
{067BCC8C-FC25-4929-B4F4-C6A5A7496994} = {6EC98884-A3DC-4828-85EF-5F10F7519429}
{68C57430-3E92-4B50-A9A5-208FE9CCD914} = {12081C35-76DF-450C-AC83-1E1CB84516AA}
{6E2DD21E-0854-4F4A-B925-D90E0016D03D} = {BF8F4E07-3B89-4152-89F4-9EF9D4AAA1E0}
{C32E74A3-C0BD-42DE-9E2F-D033D496ACB9} = {BF8F4E07-3B89-4152-89F4-9EF9D4AAA1E0}
{E4E75C18-4156-4213-A20C-8677EF6B5312} = {BF8F4E07-3B89-4152-89F4-9EF9D4AAA1E0}
{429D5F83-7FEC-4D09-AB82-E868EB61AF59} = {E4E75C18-4156-4213-A20C-8677EF6B5312}
{CE06453E-44E7-4D50-9A68-AA15F4C1C8D1} = {BF8F4E07-3B89-4152-89F4-9EF9D4AAA1E0}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {55AC11EF-F568-4C79-A356-7ED9510145B1}
EndGlobalSection
GlobalSection(SharedMSBuildProjectFiles) = preSolution
Runtimes\NET\BepInEx.NET.Shared\BepInEx.NET.Shared.projitems*{08083f40-98aa-4176-ba01-817c18c35c7f}*SharedItemsImports = 5
BepInEx.Shared\BepInEx.Shared.projitems*{15f8bc38-a761-4f93-8903-1b531ac5d9f9}*SharedItemsImports = 5
BepInEx.Shared\BepInEx.Shared.projitems*{429d5f83-7fec-4d09-ab82-e868eb61af59}*SharedItemsImports = 5
Runtimes\NET\BepInEx.NET.Shared\BepInEx.NET.Shared.projitems*{490b052b-7f23-4052-ad04-613856618901}*SharedItemsImports = 5
BepInEx.Shared\BepInEx.Shared.projitems*{4ffba620-f5ed-47f9-b90c-dad1316fd9b9}*SharedItemsImports = 5
BepInEx.Shared\BepInEx.Shared.projitems*{d404c973-441d-48ed-b266-c21320ba0d87}*SharedItemsImports = 5
BepInEx.Shared\BepInEx.Shared.projitems*{eae9fae6-8011-45a3-8b6e-0c7f14210533}*SharedItemsImports = 5
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion Runtimes/Unity/BepInEx.Unity.Common/BepInEx.Unity.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AssetRipper.VersionUtilities" Version="1.2.1"/>
<PackageReference Include="AssetRipper.Primitives" Version="2.1.1"/>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all"/>
<PackageReference Include="MonoMod.Utils" Version="22.5.1.1"/>
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Runtimes/Unity/BepInEx.Unity.Common/UnityInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using System;
using System;
using System.Diagnostics;
using System.IO;
using System.Runtime.CompilerServices;
using System.Text;
using AssetRipper.VersionUtilities;
using AssetRipper.Primitives;
using MonoMod.Utils;

[assembly: InternalsVisibleTo("BepInEx.Unity.Mono.Preloader")]
Expand Down
12 changes: 6 additions & 6 deletions Runtimes/Unity/BepInEx.Unity.IL2CPP/BepInEx.Unity.IL2CPP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Description>BepInEx support library for Il2Cpp games</Description>
<TargetFramework>net6.0</TargetFramework>
Expand All @@ -14,15 +14,15 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="HarmonyX" Version="2.10.1"/>
<PackageReference Include="Iced" Version="1.18.0"/>
<PackageReference Include="Il2CppInterop.Generator" Version="1.4.6-ci.389"/>
<PackageReference Include="Il2CppInterop.HarmonySupport" Version="1.4.6-ci.389"/>
<PackageReference Include="Iced" Version="1.20.0"/>
<ProjectReference Include="..\..\..\..\Il2CppInterop\Il2CppInterop.Generator\Il2CppInterop.Generator.csproj"/>
<ProjectReference Include="..\..\..\..\Il2CppInterop\Il2CppInterop.HarmonySupport\Il2CppInterop.HarmonySupport.csproj"/>
<PackageReference Include="Il2CppInterop.ReferenceLibs" Version="1.0.0" IncludeAssets="compile" PrivateAssets="all"/>
<PackageReference Include="Il2CppInterop.Runtime" Version="1.4.6-ci.389"/>
<ProjectReference Include="..\..\..\..\Il2CppInterop\Il2CppInterop.Runtime\Il2CppInterop.Runtime.csproj"/>
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" IncludeAssets="compile" PrivateAssets="all"/>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" IncludeAssets="compile" PrivateAssets="all"/>
<PackageReference Include="MonoMod.RuntimeDetour" Version="22.5.1.1"/>
<PackageReference Include="Samboy063.Cpp2IL.Core" Version="2022.1.0-development.866"/>
<PackageReference Include="Samboy063.Cpp2IL.Core" Version="2022.1.0-development.972"/>
</ItemGroup>

<!-- CopyLocalLockFileAssemblies causes to also output shared assemblies: https://github.com/NuGet/Home/issues/4837#issuecomment-354536302 -->
Expand Down
2 changes: 1 addition & 1 deletion Runtimes/Unity/BepInEx.Unity.IL2CPP/Il2CppInteropManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ private static void DownloadUnityAssemblies()
cpp2IlProcessingLayer.Process(Cpp2IlApi.CurrentAppContext);
}

var assemblies = new AsmResolverDummyDllOutputFormat().BuildAssemblies(Cpp2IlApi.CurrentAppContext);
var assemblies = new AsmResolverDllOutputFormatDefault().BuildAssemblies(Cpp2IlApi.CurrentAppContext);

LibCpp2IlMain.Reset();
Cpp2IlApi.CurrentAppContext = null;
Expand Down
2 changes: 1 addition & 1 deletion Runtimes/Unity/BepInEx.Unity.IL2CPP/Logging/IL2CPPUnityLogSource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public class IL2CPPUnityLogSource : ILogSource
{
public IL2CPPUnityLogSource()
{
Application.s_LogCallbackHandler = new Action<string, string, LogType>(UnityLogCallback);
//Application.s_LogCallbackHandler = new Action<string, string, LogType>(UnityLogCallback);

Il2CppInterop.Runtime.IL2CPP
.ResolveICall<
Expand Down
4 changes: 2 additions & 2 deletions Runtimes/Unity/BepInEx.Unity.Mono.Preloader/EntrypointPatcher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ internal class EntrypointPatcher : BasePatcher
"The name of the method in the specified entrypoint assembly and type to hook and load Chainloader from.");

private static string DefaultEntrypointAssembly =>
UnityInfo.Version.IsLess(2017) ? "UnityEngine.dll" : "UnityEngine.CoreModule.dll";
UnityInfo.Version.LessThan(2017) ? "UnityEngine.dll" : "UnityEngine.CoreModule.dll";

private static string DefaultEntrypointType => UnityInfo.Version.IsLess(5) ? "MonoBehaviour" : "Application";
private static string DefaultEntrypointType => UnityInfo.Version.LessThan(5) ? "MonoBehaviour" : "Application";

private bool HasLoaded { get; set; }

Expand Down