tor 4.1.5

README.md

@@ -40,7 +40,8 @@ The [Role Assignment](#role-assignment) sections explains how the roles are bein
 # Releases
 | Among Us - Version| Mod Version | Link |
 |----------|-------------|-----------------|
-| 2022.3.29 & 2022.4.19e| v4.1.3| [Download](https://github.com/Eisbison/TheOtherRoles/releases/download/v4.1.3/TheOtherRoles.zip)
+| 2022.3.29| v4.1.4| [Download](https://github.com/Eisbison/TheOtherRoles/releases/download/v4.1.4/TheOtherRoles.zip)
+| 2022.3.29| v4.1.3| [Download](https://github.com/Eisbison/TheOtherRoles/releases/download/v4.1.3/TheOtherRoles.zip)
 | 2022.3.29| v4.1.2| [Download](https://github.com/Eisbison/TheOtherRoles/releases/download/v4.1.2/TheOtherRoles.zip)
 | 2022.3.29| v4.1.1| [Download](https://github.com/Eisbison/TheOtherRoles/releases/download/v4.1.1/TheOtherRoles.zip)
 | 2022.3.29| v4.1.0| [Download](https://github.com/Eisbison/TheOtherRoles/releases/download/v4.1.0/TheOtherRoles.zip)
@@ -104,6 +105,17 @@ The [Role Assignment](#role-assignment) sections explains how the roles are bein
 # Changelog
 <details>
   <summary>Click to show the Changelog</summary>
+
+**Version 4.1.4**
+- Added auto updating for BepInEx
+- Fixed hat testing in freeplay for meetings / exile etc.
+- Fixed players not being able to move
+- Fixed getting stuck on the polus laboratory vent
+- Fixed Sherrif suicide with bloody modifier having a trail as a ghost
+- Fixed being able to kill the first killed protected player when a meeting was starting
+- Fixed some cases of the Reliable Packet Not Ack'ed disconnections
+- Fixed the double mod stamp being shown in game
+- Further improvements towards rubberbanding
 
 **Version 4.1.3**
 - Fixed morphling's being morphed during meetings

TheOtherRoles/Helpers.cs

@@ -8,6 +8,7 @@
 using TheOtherRoles.Modules;
 using HarmonyLib;
 using Hazel;
+using TheOtherRoles.Players;
 using TheOtherRoles.Utilities;
 
 namespace TheOtherRoles {
@@ -68,7 +69,7 @@ public static Texture2D loadTextureFromDisk(string path) {
 
         public static PlayerControl playerById(byte id)
         {
-            foreach (PlayerControl player in PlayerControl.AllPlayerControls.GetFastEnumerator())
+            foreach (PlayerControl player in CachedPlayer.AllPlayers)
                 if (player.PlayerId == id)
                     return player;
             return null;
@@ -77,15 +78,15 @@ public static PlayerControl playerById(byte id)
         public static Dictionary<byte, PlayerControl> allPlayersById()
         {
             Dictionary<byte, PlayerControl> res = new Dictionary<byte, PlayerControl>();
-            foreach (PlayerControl player in PlayerControl.AllPlayerControls.GetFastEnumerator())
+            foreach (PlayerControl player in CachedPlayer.AllPlayers)
                 res.Add(player.PlayerId, player);
             return res;
         }
 
         public static void handleVampireBiteOnBodyReport() {
             // Murder the bitten player and reset bitten (regardless whether the kill was successful or not)
             Helpers.checkMuderAttemptAndKill(Vampire.vampire, Vampire.bitten, true, false);
-            MessageWriter writer = AmongUsClient.Instance.StartRpcImmediately(PlayerControl.LocalPlayer.NetId, (byte)CustomRPC.VampireSetBitten, Hazel.SendOption.Reliable, -1);
+            MessageWriter writer = AmongUsClient.Instance.StartRpcImmediately(CachedPlayer.LocalPlayer.PlayerControl.NetId, (byte)CustomRPC.VampireSetBitten, Hazel.SendOption.Reliable, -1);
             writer.Write(byte.MaxValue);
             writer.Write(byte.MaxValue);
             AmongUsClient.Instance.FinishRpcImmediately(writer);
@@ -234,7 +235,7 @@ public static void setLook(this PlayerControl target, String playerName, int col
             target.RawSetColor(colorId);
             target.RawSetVisor(visorId);
             target.RawSetHat(hatId, colorId);
-            target.RawSetName(hidePlayerName(PlayerControl.LocalPlayer, target) ? "" : playerName);
+            target.RawSetName(hidePlayerName(CachedPlayer.LocalPlayer.PlayerControl, target) ? "" : playerName);
 
             SkinViewData nextSkin = FastDestroyableSingleton<HatManager>.Instance.GetSkinById(skinId).viewData.viewData;
             PlayerPhysics playerPhysics = target.MyPhysics;
@@ -294,9 +295,9 @@ public static bool roleCanUseVents(this PlayerControl player) {
             else if (Vulture.canUseVents && Vulture.vulture != null && Vulture.vulture == player)
                 roleCouldUse = true;
             else if (player.Data?.Role != null && player.Data.Role.CanVent)  {
-                if (Janitor.janitor != null && Janitor.janitor == PlayerControl.LocalPlayer)
+                if (Janitor.janitor != null && Janitor.janitor == CachedPlayer.LocalPlayer.PlayerControl)
                     roleCouldUse = false;
-                else if (Mafioso.mafioso != null && Mafioso.mafioso == PlayerControl.LocalPlayer && Godfather.godfather != null && !Godfather.godfather.Data.IsDead)
+                else if (Mafioso.mafioso != null && Mafioso.mafioso == CachedPlayer.LocalPlayer.PlayerControl && Godfather.godfather != null && !Godfather.godfather.Data.IsDead)
                     roleCouldUse = false;
                 else
                     roleCouldUse = true;
@@ -315,7 +316,7 @@ public static MurderAttemptResult checkMuderAttempt(PlayerControl killer, Player
 
             // Handle blank shot
             if (Pursuer.blankedList.Any(x => x.PlayerId == killer.PlayerId)) {
-                MessageWriter writer = AmongUsClient.Instance.StartRpcImmediately(PlayerControl.LocalPlayer.NetId, (byte)CustomRPC.SetBlanked, Hazel.SendOption.Reliable, -1);
+                MessageWriter writer = AmongUsClient.Instance.StartRpcImmediately(CachedPlayer.LocalPlayer.PlayerControl.NetId, (byte)CustomRPC.SetBlanked, Hazel.SendOption.Reliable, -1);
                 writer.Write(killer.PlayerId);
                 writer.Write((byte)0);
                 AmongUsClient.Instance.FinishRpcImmediately(writer);
@@ -355,7 +356,7 @@ public static MurderAttemptResult checkMuderAttemptAndKill(PlayerControl killer,
 
             MurderAttemptResult murder = checkMuderAttempt(killer, target, isMeetingStart);
             if (murder == MurderAttemptResult.PerformKill) {
-                MessageWriter writer = AmongUsClient.Instance.StartRpcImmediately(PlayerControl.LocalPlayer.NetId, (byte)CustomRPC.UncheckedMurderPlayer, Hazel.SendOption.Reliable, -1);
+                MessageWriter writer = AmongUsClient.Instance.StartRpcImmediately(CachedPlayer.LocalPlayer.PlayerControl.NetId, (byte)CustomRPC.UncheckedMurderPlayer, Hazel.SendOption.Reliable, -1);
                 writer.Write(killer.PlayerId);
                 writer.Write(target.PlayerId);
                 writer.Write(showAnimation ? Byte.MaxValue : 0);
@@ -366,7 +367,7 @@ public static MurderAttemptResult checkMuderAttemptAndKill(PlayerControl killer,
         }
 
         public static void shareGameVersion() {
-            MessageWriter writer = AmongUsClient.Instance.StartRpcImmediately(PlayerControl.LocalPlayer.NetId, (byte)CustomRPC.VersionHandshake, Hazel.SendOption.Reliable, -1);
+            MessageWriter writer = AmongUsClient.Instance.StartRpcImmediately(CachedPlayer.LocalPlayer.PlayerControl.NetId, (byte)CustomRPC.VersionHandshake, Hazel.SendOption.Reliable, -1);
             writer.Write((byte)TheOtherRolesPlugin.Version.Major);
             writer.Write((byte)TheOtherRolesPlugin.Version.Minor);
             writer.Write((byte)TheOtherRolesPlugin.Version.Build);
@@ -379,7 +380,7 @@ public static void shareGameVersion() {
 
         public static List<PlayerControl> getKillerTeamMembers(PlayerControl player) {
             List<PlayerControl> team = new List<PlayerControl>();
-            foreach(PlayerControl p in PlayerControl.AllPlayerControls.GetFastEnumerator()) {
+            foreach(PlayerControl p in CachedPlayer.AllPlayers) {
                 if (player.Data.Role.IsImpostor && p.Data.Role.IsImpostor && player.PlayerId != p.PlayerId && team.All(x => x.PlayerId != p.PlayerId)) team.Add(p);
                 else if (player == Jackal.jackal && p == Sidekick.sidekick) team.Add(p); 
                 else if (player == Sidekick.sidekick && p == Jackal.jackal) team.Add(p);

TheOtherRoles/Main.cs

@@ -12,6 +12,7 @@
 using System;
 using UnityEngine;
 using TheOtherRoles.Modules;
+using TheOtherRoles.Players;
 using TheOtherRoles.Utilities;
 
 namespace TheOtherRoles
@@ -22,7 +23,7 @@ namespace TheOtherRoles
     public class TheOtherRolesPlugin : BasePlugin
     {
         public const string Id = "me.eisbison.theotherroles";
-        public const string VersionString = "4.1.3";
+        public const string VersionString = "4.1.4";
 
         public static Version Version = Version.Parse(VersionString);
         internal static BepInEx.Logging.ManualLogSource Logger;
@@ -62,6 +63,8 @@ public static void UpdateRegions() {
 
         public override void Load() {
             Logger = Log;
+            Instance = this;
+
             DebugMode = Config.Bind("Custom", "Enable Debug Mode", false);
             StreamerMode = Config.Bind("Custom", "Enable Streamer Mode", false);
             GhostsSeeTasks = Config.Bind("Custom", "Ghosts See Remaining Tasks", true);
@@ -86,11 +89,18 @@ public override void Load() {
             GameOptionsData.MinPlayers = Enumerable.Repeat(4, 15).ToArray(); // Min Players = 4
 
             DebugMode = Config.Bind("Custom", "Enable Debug Mode", false);
-            Instance = this;
+            Harmony.PatchAll();
+
             CustomOptionHolder.Load();
             CustomColors.Load();
             Patches.FreeNamePatch.Initialize();
-            Harmony.PatchAll();
+
+            if (BepInExUpdater.UpdateRequired)
+            {
+                AddComponent<BepInExUpdater>();
+                return;
+            }
+
             SubmergedCompatibility.Initialize();
             AddComponent<ModUpdateBehaviour>();
         }
@@ -139,7 +149,7 @@ public static void Postfix(KeyboardJoystick __instance)
                 GameData.Instance.AddPlayer(playerControl);
                 AmongUsClient.Instance.Spawn(playerControl, -2, InnerNet.SpawnFlags.None);
 
-                playerControl.transform.position = PlayerControl.LocalPlayer.transform.position;
+                playerControl.transform.position = CachedPlayer.LocalPlayer.transform.position;
                 playerControl.GetComponent<DummyBehaviour>().enabled = true;
                 playerControl.NetTransform.enabled = false;
                 playerControl.SetName(RandomString(10));
@@ -149,7 +159,7 @@ public static void Postfix(KeyboardJoystick __instance)
 
             // Terminate round
             if(Input.GetKeyDown(KeyCode.L)) {
-                MessageWriter writer = AmongUsClient.Instance.StartRpcImmediately(PlayerControl.LocalPlayer.NetId, (byte)CustomRPC.ForceEnd, Hazel.SendOption.Reliable, -1);
+                MessageWriter writer = AmongUsClient.Instance.StartRpcImmediately(CachedPlayer.LocalPlayer.PlayerControl.NetId, (byte)CustomRPC.ForceEnd, Hazel.SendOption.Reliable, -1);
                 AmongUsClient.Instance.FinishRpcImmediately(writer);
                 RPCProcedure.forceEnd();
             }

TheOtherRoles/Modules/BepInExUpdater.cs

@@ -0,0 +1,77 @@
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using System.Net.Http;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Threading.Tasks;
+using BepInEx;
+using BepInEx.IL2CPP;
+using BepInEx.IL2CPP.Utils;
+using HarmonyLib;
+using UnityEngine;
+using UnityEngine.Networking;
+
+namespace TheOtherRoles.Modules;
+
+public class BepInExUpdater : MonoBehaviour
+{
+    public const string MinimumBepInExVersion = "6.0.0.559";
+    public const string BepInExDownloadURL = "https://builds.bepinex.dev/projects/bepinex_be/559/BepInEx_UnityIL2CPP_x86_fba4461_6.0.0-be.559.zip";
+    public static bool UpdateRequired => typeof(IL2CPPChainloader).Assembly.GetName().Version < Version.Parse(MinimumBepInExVersion);
+
+    public void Awake()
+    {
+        TheOtherRolesPlugin.Logger.LogMessage("BepInEx Update Required...");
+        this.StartCoroutine(CoUpdate());
+    }
+
+    [HideFromIl2Cpp]
+    public IEnumerator CoUpdate()
+    {
+        Task.Run(() => MessageBox(IntPtr.Zero, "Required BepInEx update is downloading, please wait...","The Other Roles", 0));
+        UnityWebRequest www = UnityWebRequest.Get(BepInExDownloadURL);
+        yield return www.Send();        
+        if (www.isNetworkError || www.isHttpError)
+        {
+            TheOtherRolesPlugin.Logger.LogError(www.error);
+            yield break;
+        }
+
+        var zipPath = Path.Combine(Paths.GameRootPath, ".bepinex_update");
+        File.WriteAllBytes(zipPath, www.downloadHandler.data);
+
+
+        var tempPath = Path.Combine(Path.GetTempPath(), "TheOtherUpdater.exe");
+        var asm = Assembly.GetExecutingAssembly();
+        var exeName = asm.GetManifestResourceNames().FirstOrDefault(n => n.EndsWith("TheOtherUpdater.exe"));
+
+        using(var resource = asm.GetManifestResourceStream(exeName))
+        {
+            using(var file = new FileStream(tempPath, FileMode.OpenOrCreate, FileAccess.Write))
+            {
+                resource!.CopyTo(file);
+            } 
+        }
+
+        var startInfo = new ProcessStartInfo(tempPath, $"--game-path \"{Paths.GameRootPath}\" --zip \"{zipPath}\"");
+        startInfo.UseShellExecute = false;
+        Process.Start(startInfo);
+        Application.Quit();
+    }
+
+    [DllImport("user32.dll")]
+    public static extern int MessageBox(IntPtr hWnd, String text, String caption, int options);
+}
+
+[HarmonyPatch(typeof(SplashManager), nameof(SplashManager.Update))]
+public static class StopLoadingMainMenu
+{
+    public static bool Prefix()
+    {
+        return !BepInExUpdater.UpdateRequired;
+    }
+}