From 55ff1074fb7411576ccd41c1040ccca08f02172b Mon Sep 17 00:00:00 2001 From: ALittlePatate Date: Fri, 29 Mar 2024 18:54:24 +0100 Subject: [PATCH] fix: build errors and warnings, updated achievements --- DevourClient/DevourClient.csproj | 74 ++++++++++++++++++++++++++++++++ DevourClient/Hacks/Misc.cs | 8 ++-- DevourClient/Hacks/Unlock.cs | 2 +- DevourClient/MelonMain.cs | 4 +- 4 files changed, 81 insertions(+), 7 deletions(-) diff --git a/DevourClient/DevourClient.csproj b/DevourClient/DevourClient.csproj index 91b5fbf..cb40648 100644 --- a/DevourClient/DevourClient.csproj +++ b/DevourClient/DevourClient.csproj @@ -12,4 +12,78 @@ 0 + + + D:\Jeux\steamapps\common\Devour\MelonLoader\net6\0Harmony.dll + + + D:\Jeux\steamapps\common\Devour\MelonLoader\Il2CppAssemblies\Assembly-CSharp.dll + + + D:\Jeux\steamapps\common\Devour\MelonLoader\Il2CppAssemblies\Il2CppBehaviorDesigner.Runtime.dll + + + D:\Jeux\steamapps\common\Devour\MelonLoader\Il2CppAssemblies\Il2Cppbolt.dll + + + D:\Jeux\steamapps\common\Devour\MelonLoader\Il2CppAssemblies\Il2Cppbolt.user.dll + + + D:\Jeux\steamapps\common\Devour\MelonLoader\net6\Il2CppInterop.Runtime.dll + + + D:\Jeux\steamapps\common\Devour\MelonLoader\Il2CppAssemblies\Il2Cppmscorlib.dll + + + D:\Jeux\steamapps\common\Devour\MelonLoader\Il2CppAssemblies\Il2CppOpsive.UltimateCharacterController.dll + + + D:\Jeux\steamapps\common\Devour\MelonLoader\Il2CppAssemblies\Il2CppRewired_Core.dll + + + D:\Jeux\steamapps\common\Devour\MelonLoader\Il2CppAssemblies\Il2Cppudpkit.dll + + + D:\Jeux\steamapps\common\Devour\MelonLoader\Il2CppAssemblies\Il2Cppudpkit.common.dll + + + D:\Jeux\steamapps\common\Devour\MelonLoader\Il2CppAssemblies\Il2Cppudpkit.platform.photon.dll + + + D:\Jeux\steamapps\common\Devour\MelonLoader\Il2CppAssemblies\Il2CppVendor.dll + + + D:\Jeux\steamapps\common\Devour\MelonLoader\net6\MelonLoader.dll + + + D:\Jeux\steamapps\common\Devour\MelonLoader\Il2CppAssemblies\UnityEngine.dll + + + D:\Jeux\steamapps\common\Devour\MelonLoader\Il2CppAssemblies\UnityEngine.AnimationModule.dll + + + D:\Jeux\steamapps\common\Devour\MelonLoader\Il2CppAssemblies\UnityEngine.CoreModule.dll + + + D:\Jeux\steamapps\common\Devour\MelonLoader\Il2CppAssemblies\UnityEngine.HotReloadModule.dll + + + D:\Jeux\steamapps\common\Devour\MelonLoader\Il2CppAssemblies\UnityEngine.IMGUIModule.dll + + + D:\Jeux\steamapps\common\Devour\MelonLoader\Il2CppAssemblies\UnityEngine.InputLegacyModule.dll + + + D:\Jeux\steamapps\common\Devour\MelonLoader\Il2CppAssemblies\UnityEngine.InputModule.dll + + + D:\Jeux\steamapps\common\Devour\MelonLoader\Il2CppAssemblies\UnityEngine.PhysicsModule.dll + + + D:\Jeux\steamapps\common\Devour\MelonLoader\Il2CppAssemblies\UnityEngine.UI.dll + + + D:\Jeux\steamapps\common\Devour\MelonLoader\Il2CppAssemblies\UnityEngine.UIModule.dll + + \ No newline at end of file diff --git a/DevourClient/Hacks/Misc.cs b/DevourClient/Hacks/Misc.cs index 966aa49..806a659 100644 --- a/DevourClient/Hacks/Misc.cs +++ b/DevourClient/Hacks/Misc.cs @@ -134,7 +134,7 @@ namespace DevourClient.Hacks GameObject _azazel; _azazel = BoltNetwork.Instantiate(_azazelPrefabId, new Vector3(pos.x, pos.y, pos.z + 1f), Quaternion.identity); - Il2Cpp.SurvivalAzazelBehaviour azazelBehaviour = _azazel?.GetComponent(); + Il2Cpp.SurvivalAzazelBehaviour? azazelBehaviour = _azazel?.GetComponent(); if (_azazel != null) { @@ -208,9 +208,9 @@ namespace DevourClient.Hacks BoltLauncher.StartServer(__config, null); - Il2CppHorror.Menu.ShowCanvasGroup(_menu.loadingCanvasGroup, true); - Il2CppHorror.Menu.ShowCanvasGroup(_menu.hostCanvasGroup, false); - Il2CppHorror.Menu.ShowCanvasGroup(_menu.mainMenuCanvasGroup, false); + _menu.ShowCanvasGroup(_menu.loadingCanvasGroup, true); + _menu.ShowCanvasGroup(_menu.hostCanvasGroup, false); + _menu.ShowCanvasGroup(_menu.mainMenuCanvasGroup, false); } public static void SetSteamName(string name) diff --git a/DevourClient/Hacks/Unlock.cs b/DevourClient/Hacks/Unlock.cs index 54d637a..5242eb0 100644 --- a/DevourClient/Hacks/Unlock.cs +++ b/DevourClient/Hacks/Unlock.cs @@ -6,7 +6,7 @@ { Il2Cpp.AchievementHelpers ah = UnityEngine.Object.FindObjectOfType(); - string[] achievements = { "STAT_NUM_BLEACH_USED", "STAT_HORSESHOES_COLLECTED","STAT_NUM_CORPSES_FRIED", "ACH_ALL_ROSES", "ACH_BURNT_GOAT", "ACH_SURVIVED_TO_3_GOATS", "ACH_SURVIVED_TO_5_GOATS", "ACH_SURVIVED_TO_7_GOATS", "ACH_WON_SP", "ACH_WON_COOP", "ACH_LOST", "ACH_LURED_20_GOATS", "ACH_REVIVED_20_PLAYERS", "ACH_ALL_NOTES_READ", "ACH_KNOCKED_OUT_BY_ANNA", "ACH_KNOCKOUT_OUT_BY_DEMON", "ACH_KNOCKED_OUT_20_TIMES", "ACH_NEVER_KNOCKED_OUT", "ACH_ONLY_ONE_KNOCKED_OUT", "ACH_UNLOCKED_CAGE", "ACH_UNLOCKED_ATTIC_CAGE", "ACH_BEAT_GAME_5_TIMES", "ACH_100_GASOLINE_USED", "ACH_FRIED_20_DEMONS", "ACH_STAGGERED_ANNA_20_TIMES", "ACH_CALMED_ANNA_10_TIMES", "ACH_CALMED_ANNA", "ACH_WIN_NIGHTMARE", "ACH_BEAT_GAME_5_TIMES_IN_NIGHTMARE_MODE", "ACH_WON_NO_KNOCKOUT_COOP", "ACH_WIN_NIGHTMARE_SP", "ACH_WON_HARD", "ACH_WON_HARD_SP", "ACH_100_FUSES_USED", "ACH_ALL_CLIPBOARDS_READ", "ACH_ALL_PATCHES", "ACH_FRIED_RAT", "ACH_FRIED_100_INMATES", "ACH_LURED_20_RATS", "ACH_STAGGERED_MOLLY_20_TIMES", "ACH_WON_MOLLY_SP", "ACH_WON_MOLLY_HARD_SP", "ACH_WON_MOLLY_NIGHTMARE_SP", "ACH_WON_MOLLY_COOP", "ACH_WON_MOLLY_HARD", "ACH_WON_MOLLY_NIGHTMARE", "ACH_20_TRASH_CANS_KICKED", "ACH_CALM_MOLLY_10_TIMES", "ACH_STAGGERED_ZARA_20_TIMES", "ACH_WON_INN_SP", "ACH_WON_INN_COOP", "ACH_ALL_CHERRY_BLOSSOM", "ACH_100_EGGS_DESTROYED", "ACH_FRIED_1000_SPIDERS", "ACH_KNOCKED_OUT_IN_HIDING", "ACH_20_BLEACH_USED", "ACH_WON_INN_HARD", "ACH_WON_INN_HARD_SP", "ACH_WON_INN_NIGHTMARE", "ACH_WON_INN_NIGHTMARE_SP", "ACH_WON_NO_MEDKITS", "ACH_WON_HARD_NO_MEDKITS", "ACH_WON_NIGHTMARE_NO_MEDKITS", "ACH_WON_NO_BATTERIES", "ACH_WON_HARD_NO_BATTERIES", "ACH_WON_NIGHTMARE_NO_BATTERIES", "ACH_ALL_HORSESHOES", "ACH_STAGGERED_SAM_20_TIMES", "ACH_WON_TOWN_SP", "ACH_WON_TOWN_COOP", "ACH_WON_TOWN_HARD", "ACH_WON_TOWN_NIGHTMARE", "ACH_WON_TOWN_HARD_SP", "ACH_WON_TOWN_NIGHTMARE_SP", "ACH_1000_BOOKS_DESTROYED", "ACH_100_BOOKS_CURSED", "ACH_FRIED_1000_GHOSTS", "ACH_STAGGERED_NATHAN_20_TIMES", "ACH_WON_SLAUGHTERHOUSE_SP", "ACH_WON_SLAUGHTERHOUSE_COOP", "ACH_WON_SLAUGHTERHOUSE_HARD", "ACH_WON_SLAUGHTERHOUSE_HARD_SP", "ACH_WON_SLAUGHTERHOUSE_NIGHTMARE", "ACH_WON_SLAUGHTERHOUSE_NIGHTMARE_SP", "ACH_20_POOPS_SEARCHED", "ACH_FRIED_1000_BOARS", "ACH_1000_PIGS_DESTROYED", "ACH_FRIED_100_CORPSES", "ACH_ALL_BARBED_WIRES", "ACH_WON_HARD_ANNA", "ACH_WON_HARD_APRIL", "ACH_WON_HARD_CULTIST", "ACH_WON_HARD_FRANK", "ACH_WON_HARD_KAI", "ACH_WON_HARD_MOLLY", "ACH_WON_HARD_NATHAN", "ACH_WON_HARD_SAM", "ACH_WON_HARD_ZARA", "ACH_WON_NIGHTMARE_ANNA", "ACH_WON_NIGHTMARE_APRIL", "ACH_WON_NIGHTMARE_CULTIST", "ACH_WON_NIGHTMARE_FRANK", "ACH_WON_NIGHTMARE_KAI", "ACH_WON_NIGHTMARE_MOLLY", "ACH_WON_NIGHTMARE_NATHAN", "ACH_WON_NIGHTMARE_SAM", "ACH_WON_NIGHTMARE_ZARA" }; + string[] achievements = {"ACH_ALL_CLIPBOARDS_READ", "ACH_ALL_NOTES_READ", "ACH_UNLOCKED_CAGE", "ACH_UNLOCKED_ATTIC_CAGE", "ACH_CALMED_ANNA", "ACH_FRIED_RAT", "ACH_BURNT_GOAT", "ACH_KNOCKED_OUT_BY_ANNA", "ACH_KNOCKOUT_OUT_BY_DEMON", "ACH_KNOCKED_OUT_IN_HIDING", "STAT_NUM_BLEACH_USED", "ACH_WON_SP", "ACH_WIN_NIGHTMARE", "ACH_WON_HARD_SP", "ACH_WON_COOP", "ACH_WON_HARD", "ACH_WIN_NIGHTMARE_SP", "ACH_LOST", "ACH_NEVER_KNOCKED_OUT", "ACH_ONLY_ONE_KNOCKED_OUT", "ACH_WON_HARD_NO_MEDKITS", "ACH_WON_NO_MEDKITS", "ACH_WON_NO_BATTERIES", "ACH_WON_NIGHTMARE_NO_MEDKITS", "ACH_WON_NO_KNOCKOUT_COOP", "ACH_WON_HARD_NO_BATTERIES", "ACH_WON_HARD_{0}", "ACH_WON_NIGHTMARE_{0}", "ACH_WON_NIGHTMARE_NO_BATTERIES", "ACH_SURVIVED_TO_7_GOATS", "ACH_SURVIVED_TO_5_GOATS", "ACH_SURVIVED_TO_3_GOATS", "ACH_WON_Manor_NIGHTMARE_SP", "ACH_WON_NIGHTMARE_", "ACH_WON_MANOR_NIGHTMARE_SP", "ACH_WON_TOWN_HARD", "ACH_WON_INN_HARD_SP", "ACH_ALL_FEATHERS", "ACH_WON_SLAUGHTERHOUSE_COOP", "ACH_ALL_BARBED_WIRES", "ACH_WON_INN_HARD", "ACH_WON_MOLLY_HARD", "ACH_ALL_HORSESHOES", "ACH_WON_MOLLY_HARD_SP", "ACH_WON_TOWN_NIGHTMARE_SP", "ACH_100_GASOLINE_USED", "ACH_WON_INN_SP", "ACH_WON_MANOR_HARD_SP", "ACH_WON_MOLLY_SP", "ACH_1000_PIGS_DESTROYED", "ACH_1000_MIRRORS_DESTROYED", "ACH_100_EGGS_DESTROYED", "ACH_WON_SLAUGHTERHOUSE_HARD_SP", "ACH_WON_TOWN_COOP", "ACH_100_FUSES_USED", "ACH_WON_MOLLY_COOP", "ACH_WON_MOLLY_NIGHTMARE_SP", "ACH_1000_BOOKS_DESTROYED", "ACH_ALL_PATCHES", "ACH_WON_SLAUGHTERHOUSE_SP", "ACH_WON_TOWN_NIGHTMARE", "ACH_WON_INN_COOP", "ACH_ALL_CHERRY_BLOSSOM", "ACH_WON_TOWN_HARD_SP", "ACH_WON_MOLLY_NIGHTMARE", "ACH_WON_INN_NIGHTMARE_SP", "ACH_ALL_ROSES", "ACH_WON_TOWN_SP", "ACH_WON_SLAUGHTERHOUSE_NIGHTMARE_SP", "ACH_WON_INN_NIGHTMARE", "ACH_WON_MANOR_COOP", "ACH_WON_SLAUGHTERHOUSE_HARD", "ACH_WON_SLAUGHTERHOUSE_NIGHTMARE", "ACH_WON_MANOR_HARD", "ACH_WON_MANOR_NIGHTMARE", "ACH_WON_MANOR_SP", }; for (int i = 0; i < achievements.Length; i++) { diff --git a/DevourClient/MelonMain.cs b/DevourClient/MelonMain.cs index c547d28..65d1df1 100644 --- a/DevourClient/MelonMain.cs +++ b/DevourClient/MelonMain.cs @@ -18,8 +18,8 @@ namespace DevourClient { public class Load : MelonLoader.MelonMod { - public static ClientMain ClientMainInstance { get; private set; } - public static GameObject DevourClientGO { get; private set; } + public static ClientMain ClientMainInstance { get; private set; } = default!; + public static GameObject DevourClientGO { get; private set; } = default!; public static void Init() { ClassInjector.RegisterTypeInIl2Cpp();