diff --git a/CustomKeybinds/CustomKeybinds.csproj b/CustomKeybinds/CustomKeybinds.csproj index 9fe128e..3531a14 100644 --- a/CustomKeybinds/CustomKeybinds.csproj +++ b/CustomKeybinds/CustomKeybinds.csproj @@ -5,7 +5,7 @@ I:\Games\AmongUs_Modding\latest_unobf\BepInEx\unhollowed\;I:\Games\AmongUs_Modding\latest_unobf\BepInEx\core\ - I:\Games\AmongUs_Modding\2021.3.31s\BepInEx\unhollowed\;I:\Games\AmongUs_Modding\2021.3.31s\BepInEx\core\ + I:\Games\AmongUs_Modding\latest\BepInEx\unhollowed\;I:\Games\AmongUs_Modding\latest\BepInEx\core\ Debug diff --git a/CustomKeybinds/Patches/KeyboardJoystickPatches.cs b/CustomKeybinds/Patches/KeyboardJoystickPatches.cs index 1808dce..9cca0ff 100644 --- a/CustomKeybinds/Patches/KeyboardJoystickPatches.cs +++ b/CustomKeybinds/Patches/KeyboardJoystickPatches.cs @@ -3,8 +3,8 @@ using UnityEngine; // DestroyableSingleton -> PPAEIPHJPDH; -// DestroyableSingleton.InstanceExists -> PPAEIPHJPDH.JECNDKBIOFO -// DestroyableSingleton.Instance -> CMJOLNCMAPD +// DestroyableSingleton.InstanceExists -> PPAEIPHJPDH.InstanceExists +// DestroyableSingleton.Instance -> Instance // MapBehaviour.Instance.IsOpen -> CBAGIJCCEGG.Instance.GELKOGPNIBJ (/!\ it's maybe IsOpenStopped // PlayerControl.LocalPlayer.Data.IsImpostor -> PlayerControl.LocalPlayer.IDOFAMCIJKE.DAPKNDBLKIA @@ -29,15 +29,15 @@ public static bool Prefix(KeyboardJoystick __instance) if (Input.GetKey(KeyCode.DownArrow) || Input.GetKey(ConfigManager.keyBinds[KeyAction.Backward])) del.y -= 1f; del.Normalize(); - __instance.GOJFEOOBJKI = del; + __instance.del = del; HandleHud(); if (Input.GetKeyDown(KeyCode.Escape)) { if (Minigame.Instance) Minigame.Instance.Close(); - else if (DestroyableSingleton.JECNDKBIOFO && MapBehaviour.Instance && - MapBehaviour.Instance.LFGAAGECFFO) + else if (DestroyableSingleton.InstanceExists && MapBehaviour.Instance && + MapBehaviour.Instance.IsOpen) MapBehaviour.Instance.Close(); else if (CustomPlayerMenu.Instance) CustomPlayerMenu.Instance.Close(true); } @@ -47,13 +47,13 @@ public static bool Prefix(KeyboardJoystick __instance) private static void HandleHud() { - if (!DestroyableSingleton.JECNDKBIOFO) return; + if (!DestroyableSingleton.InstanceExists) return; if (Input.GetKeyDown(ConfigManager.keyBinds[KeyAction.Report])) - DestroyableSingleton.CMJOLNCMAPD.ReportButton.DoClick(); + DestroyableSingleton.Instance.ReportButton.DoClick(); if (Input.GetKeyDown(ConfigManager.keyBinds[KeyAction.Use])) - DestroyableSingleton.CMJOLNCMAPD.UseButton.DoClick(); + DestroyableSingleton.Instance.UseButton.DoClick(); if (Input.GetKeyDown(ConfigManager.keyBinds[KeyAction.Map])) - DestroyableSingleton.CMJOLNCMAPD.OpenMap(); + DestroyableSingleton.Instance.OpenMap(); if (Input.GetKeyDown(ConfigManager.keyBinds[KeyAction.Tasks])) Utils.ToggleTab(); /* if((PlayerControl.LocalPlayer.IDOFAMCIJKE != null)) @@ -64,9 +64,9 @@ private static void HandleHud() System.Console.WriteLine("4: {0}", PlayerControl.LocalPlayer.IDOFAMCIJKE.FGNJJFABIHJ); } */ - if (PlayerControl.LocalPlayer.IDOFAMCIJKE != null && PlayerControl.LocalPlayer.IDOFAMCIJKE.CIDDOFDJHJH && + if (PlayerControl.LocalPlayer.Data != null && PlayerControl.LocalPlayer.Data.IsImpostor && Input.GetKeyDown(ConfigManager.keyBinds[KeyAction.Kill])) - DestroyableSingleton.CMJOLNCMAPD.KillButton.PerformKill(); + DestroyableSingleton.Instance.KillButton.PerformKill(); } } } diff --git a/CustomKeybinds/Tools/Utils.cs b/CustomKeybinds/Tools/Utils.cs index 6573c0b..6cddd1e 100644 --- a/CustomKeybinds/Tools/Utils.cs +++ b/CustomKeybinds/Tools/Utils.cs @@ -20,7 +20,7 @@ public static T GetChildComponentByName(GameObject parent, string name) where internal static void ToggleTab() { - var taskStuff = DestroyableSingleton.CMJOLNCMAPD?.TaskStuff; + var taskStuff = DestroyableSingleton.Instance?.TaskStuff; if (taskStuff == null || !taskStuff.active) return;