diff --git a/DevourClient/DevourClient.csproj b/DevourClient/DevourClient.csproj index 91b5fbf..d86f98a 100644 --- a/DevourClient/DevourClient.csproj +++ b/DevourClient/DevourClient.csproj @@ -12,4 +12,54 @@ 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\net6\MelonLoader.dll + + + D:\Jeux\steamapps\common\Devour\MelonLoader\Il2CppAssemblies\UnityEngine.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.UI.dll + + \ No newline at end of file diff --git a/DevourClient/Helpers/StateHelper.cs b/DevourClient/Helpers/StateHelper.cs index 0764773..ae50e46 100644 --- a/DevourClient/Helpers/StateHelper.cs +++ b/DevourClient/Helpers/StateHelper.cs @@ -2,6 +2,7 @@ using Il2CppOpsive.UltimateCharacterController.Character; using System.Collections.Generic; using System.Collections; +using MelonLoader; namespace DevourClient.Helpers { @@ -27,7 +28,7 @@ namespace DevourClient.Helpers return Entities.LocalPlayer_.GetComponent(); } - + public static bool IsPlayerCrawling() { Il2Cpp.NolanBehaviour nb = Player.GetPlayer(); @@ -46,11 +47,17 @@ namespace DevourClient.Helpers } } - - public class Entities + public class BasePlayer + { + public GameObject p_GameObject = default!; + public string Name = default!; + public string Id = default!; + } + + public class Entities { public static GameObject LocalPlayer_ = default!; - public static GameObject[] Players = default!; + public static BasePlayer[] Players = default!; public static Il2Cpp.GoatBehaviour[] GoatsAndRats = default!; public static Il2Cpp.SurvivalInteractable[] SurvivalInteractables = default!; public static Il2Cpp.KeyBehaviour[] Keys = default!; @@ -83,13 +90,31 @@ namespace DevourClient.Helpers { for (;;) { - Players = GameObject.FindGameObjectsWithTag("Player"); + int i = 0; + foreach (GameObject p in GameObject.FindGameObjectsWithTag("Player")) + { + string player_name = ""; + string player_id = "-1"; + + Il2Cpp.DissonancePlayerTracking dpt = p.gameObject.GetComponent(); + if (dpt != null) + { + MelonLogger.Msg(dpt.state.PlayerName + " | " + dpt.state.PlayerId.ToString()); + player_name = dpt.state.PlayerName; + player_id = dpt.state.PlayerId; + } + + Players[i].Id = player_id; + Players[i].Name = player_name; + Players[i].p_GameObject = p; + + i++; + } // Wait 5 seconds before caching objects again. yield return new WaitForSeconds(5f); } } - public static IEnumerator GetGoatsAndRats() { for (;;) diff --git a/DevourClient/MelonMain.cs b/DevourClient/MelonMain.cs index 139ee15..d9c3cfe 100644 --- a/DevourClient/MelonMain.cs +++ b/DevourClient/MelonMain.cs @@ -155,8 +155,9 @@ namespace DevourClient { if (this.player_esp || this.player_snapline) { - foreach (GameObject player in Helpers.Entities.Players) + foreach (BasePlayer Bplayer in Helpers.Entities.Players) { + GameObject player = Bplayer.p_GameObject; if (player != null) {