diff --git a/TakoTako.Common/TakoTako.Common.csproj b/TakoTako.Common/TakoTako.Common.csproj index cdaab51..91c4221 100644 --- a/TakoTako.Common/TakoTako.Common.csproj +++ b/TakoTako.Common/TakoTako.Common.csproj @@ -29,7 +29,7 @@ latest Release-BepInEx6;Release-BepInEx5;Debug-BepInEx6;Debug-BepInEx5 AnyCPU - net48;netstandard2.1 + netstandard2.0 diff --git a/TakoTako/Il2cppRedirection.cs b/TakoTako/Il2cppRedirection.cs index 7243c3e..ed6901a 100644 --- a/TakoTako/Il2cppRedirection.cs +++ b/TakoTako/Il2cppRedirection.cs @@ -1,10 +1,9 @@ #if TAIKO_IL2CPP using HarmonyLib; +using Il2CppInterop.Common.Attributes; +using Il2CppInterop.Runtime; +using Il2CppInterop.Runtime.InteropTypes.Arrays; using Il2CppSystem; -using UnhollowerBaseLib; -using UnhollowerBaseLib.Attributes; -using UnhollowerBaseLib.Runtime; -using Il2CppException = UnhollowerBaseLib.Il2CppException; namespace TakoTako; @@ -20,7 +19,9 @@ public static class Il2cppRedirection var outPtr = IntPtr.Zero; numPtr[1] = (System.IntPtr) (&outPtr); System.IntPtr exc = System.IntPtr.Zero; - var field = (System.IntPtr) AccessTools.Field(typeof(PlayDataManager), "NativeMethodInfoPtr_GetMusicInfoExAll_Public_Void_Int32_byref_ArrayOf_MusicInfoEx_0").GetValue(null); + var fieldInfo = AccessTools.Field(typeof(PlayDataManager), "NativeMethodInfoPtr_GetMusicInfoExAll_Public_Void_Int32_byref_Il2CppStructArray_1_MusicInfoEx_0") ?? + AccessTools.Field(typeof(PlayDataManager), "NativeMethodInfoPtr_GetMusicInfoExAll_Public_Void_Int32_byref_ArrayOf_MusicInfoEx_0"); + var field = (System.IntPtr)fieldInfo.GetValue(null); IL2CPP.il2cpp_runtime_invoke(field, IL2CPP.Il2CppObjectBaseToPtrNotNull(instance), (void**) numPtr, ref exc); dst = new Il2CppStructArray(outPtr); Il2CppException.RaiseExceptionIfNecessary(exc); diff --git a/TakoTako/Patches/CustomMusicLoaderPatch.cs b/TakoTako/Patches/CustomMusicLoaderPatch.cs index f303af9..3b56867 100644 --- a/TakoTako/Patches/CustomMusicLoaderPatch.cs +++ b/TakoTako/Patches/CustomMusicLoaderPatch.cs @@ -12,8 +12,7 @@ using System.Threading.Tasks; using BepInEx.Logging; using HarmonyLib; #if TAIKO_IL2CPP -using UnhollowerBaseLib; -using BepInEx.IL2CPP.Utils.Collections; +using Il2CppInterop.Runtime.InteropTypes.Arrays; using Object = Il2CppSystem.Object; #endif using Newtonsoft.Json; diff --git a/TakoTako/Patches/TaikoDrumSupportPatch.cs b/TakoTako/Patches/TaikoDrumSupportPatch.cs index a429421..371b068 100644 --- a/TakoTako/Patches/TaikoDrumSupportPatch.cs +++ b/TakoTako/Patches/TaikoDrumSupportPatch.cs @@ -3,9 +3,11 @@ using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; using HarmonyLib; using UnityEngine; +using Il2CppInterop.Runtime.InteropTypes.Arrays; +using Il2CppInterop.Runtime; +using Il2CppInterop.Runtime.InteropTypes; #if TAIKO_IL2CPP using Array = Il2CppSystem.Array; -using UnhollowerBaseLib; #endif namespace TakoTako.Patches; diff --git a/TakoTako/Plugin.cs b/TakoTako/Plugin.cs index 141fe99..1c70097 100644 --- a/TakoTako/Plugin.cs +++ b/TakoTako/Plugin.cs @@ -7,8 +7,8 @@ using HarmonyLib; using TakoTako.Patches; using UnityEngine; #if TAIKO_IL2CPP -using BepInEx.IL2CPP.Utils; -using BepInEx.IL2CPP; +using BepInEx.Unity.IL2CPP.Utils; +using BepInEx.Unity.IL2CPP; #endif #pragma warning disable BepInEx002 diff --git a/TakoTako/TakoTako.csproj b/TakoTako/TakoTako.csproj index f71ceaf..90bb90a 100644 --- a/TakoTako/TakoTako.csproj +++ b/TakoTako/TakoTako.csproj @@ -27,7 +27,7 @@ - netstandard2.1 + net6.0 net48 com.fluto.takotako A suite of mods that allow for Custom Songs and Taiko Drum support @@ -42,8 +42,8 @@ - - + +