Peasplayer · AmongUsDev · Jun 26, 2023 · Jun 27, 2023 · Jun 27, 2023
diff --git a/PeasAPI/Components/RegisterCustomGameModeAttribute.cs b/PeasAPI/Components/RegisterCustomGameModeAttribute.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Reflection;
-using BepInEx.IL2CPP;
+using BepInEx.Unity.IL2CPP;
 using HarmonyLib;
 using PeasAPI.GameModes;
 using Reactor;
@@ -38,10 +38,7 @@ public static void Register(Assembly assembly, BasePlugin plugin)
 
         public static void Load()
         {
-            ChainloaderHooks.PluginLoad += plugin =>
-            {
-                Register(plugin.GetType().Assembly, plugin);
-            };
+           IL2CPPChainloader.Instance.PluginLoad += (_, assembly, plugin) => Register(assembly, plugin);
         }
     }
 }
diff --git a/PeasAPI/Components/RegisterCustomRoleAttribute.cs b/PeasAPI/Components/RegisterCustomRoleAttribute.cs
@@ -1,9 +1,8 @@
 using System;
 using System.Reflection;
-using BepInEx.IL2CPP;
+using BepInEx.Unity.IL2CPP;
 using HarmonyLib;
 using PeasAPI.Roles;
-using Reactor;
 
 namespace PeasAPI.Components
 {
@@ -34,12 +33,12 @@ public static void Register(Assembly assembly, BasePlugin plugin)
 
                     Activator.CreateInstance(type, plugin);
                 }
-            }
+            }             
         }
 
         public static void Load()
         {
-            ChainloaderHooks.PluginLoad += plugin => Register(plugin.GetType().Assembly, plugin);
+             IL2CPPChainloader.Instance.PluginLoad += (_, assembly, plugin) => Register(assembly, plugin);
         }
     }
 }
diff --git a/PeasAPI/CustomButtons/CustomButton.cs b/PeasAPI/CustomButtons/CustomButton.cs
@@ -5,6 +5,7 @@
 using UnityEngine;
 using Action = System.Action;
 using Object = UnityEngine.Object;
+using AmongUs.GameOptions;
 
 namespace PeasAPI.CustomButtons
 {
@@ -319,7 +320,7 @@ public PlayerControl FindClosestPlayer()
         {
             var from = PlayerControl.LocalPlayer;
             PlayerControl result = null;
-            float num = GameOptionsData.KillDistances[Mathf.Clamp(PlayerControl.GameOptions.KillDistance, 0, 2)];
+            float num = GameOptionsData.KillDistances[Mathf.Clamp(GameOptionsManager.Instance.currentNormalGameOptions.KillDistance, 0, 2)];
             if (!ShipStatus.Instance)
             {
                 return null;
@@ -355,8 +356,8 @@ public GameObject FindClosestObject()
             var from = PlayerControl.LocalPlayer;
             GameObject result1 = null;
             GameObject result2 = null;
-            float num1 = GameOptionsData.KillDistances[Mathf.Clamp(PlayerControl.GameOptions.KillDistance, 0, 2)];
-            float num2 = GameOptionsData.KillDistances[Mathf.Clamp(PlayerControl.GameOptions.KillDistance, 0, 2)];
+            float num1 = GameOptionsData.KillDistances[Mathf.Clamp(GameOptionsManager.Instance.currentNormalGameOptions.KillDistance, 0, 2)];
+            float num2 = GameOptionsData.KillDistances[Mathf.Clamp(GameOptionsManager.Instance.currentNormalGameOptions.KillDistance, 0, 2)];
             if (!ShipStatus.Instance)
             {
                 return null;
@@ -430,15 +431,6 @@ public static void Prefix(HudManager __instance)
             }
         }
 
-        [HarmonyPatch(typeof(HudManager), nameof(HudManager.SetHudActive))]
-        internal static class HudManagerSetHudActivePatch
-        {
-            public static void Prefix(HudManager __instance, [HarmonyArgument(0)] bool isActive)
-            {
-                HudActive = isActive;
-            }
-        }
-
         public enum TargetType
         {
             None,

diff --git a/PeasAPI/CustomEndReason/CustomEndReason.cs b/PeasAPI/CustomEndReason/CustomEndReason.cs
@@ -2,7 +2,7 @@
 using Hazel;
 using PeasAPI.CustomRpc;
 using PeasAPI.Roles;
-using Reactor.Networking;
+using Reactor.Networking.Rpc;
 using UnityEngine;
 
 namespace PeasAPI.CustomEndReason
@@ -12,7 +12,7 @@ public class CustomEndReason
         /// <summary>
         /// Ends the game with the specified values
         /// </summary>
-        public CustomEndReason(Color color, string victoryText, string defeatText, string stinger, List<GameData.PlayerInfo> winners)
+        internal CustomEndReason(Color color, string victoryText, string defeatText, string stinger, List<GameData.PlayerInfo> winners)
         {
             Rpc<RpcCustomEndReason>.Instance.Send(new RpcCustomEndReason.Data(color, victoryText, defeatText, stinger, winners));
         }

diff --git a/PeasAPI/CustomEndReason/EndReasonManager.cs b/PeasAPI/CustomEndReason/EndReasonManager.cs
@@ -33,6 +33,7 @@ public static void Reset()
         [HarmonyPatch(typeof(EndGameManager), nameof(EndGameManager.SetEverythingUp))]
         private class SetEverythingUpPatch
         {
+            public static PlayerControl player1;
             private static readonly Color GhostColor = new(1f, 1f, 1f, 0.5f);
 
             public static bool Prefix(EndGameManager __instance)
@@ -82,21 +83,21 @@ public static bool Prefix(EndGameManager __instance)
                     transform.localScale = scaleVec;
                     if (winner.IsDead)
                     {
-                        player.BodySprites.ToArray()[0].BodySprite.sprite = __instance.GhostSprite;
-                        player.SetDeadFlipX(i % 2 == 1);
-                        player.HatSlot.color = GhostColor;
+                        player.cosmetics.currentBodySprite.BodySprite.sprite = __instance.GhostSprite;
+                        player.SetDeadFlipX(i % 2 == 0);
+                        player.cosmetics.SetHatColor(GhostColor);
                     }
                     else
                     {
                         player.SetFlipX(i % 2 == 0);
                         player.SetSkin(winner.SkinId, winner.ColorId);
                     }
 
-                    PlayerControl.SetPlayerMaterialColors(winner.ColorId, player.CurrentBodySprite.BodySprite);
-                    player.HatSlot.SetHat(winner.HatId, winner.ColorId);
-                    PlayerControl.SetPetImage(winner.PetId, winner.ColorId, player.PetSlot);
-                    player.NameText.text = winner.PlayerName;
-                    player.NameText.transform.SetLocalZ(-15f);
+                    PlayerMaterial.SetColors(winner.ColorId, player.cosmetics.currentBodySprite.BodySprite);
+                    player.cosmetics.SetHat(winner.HatId, winner.ColorId);
+                   // PlayerControl.SetPetImage(winner.PetId, winner.ColorId, player.cosmetics.CurrentPet);
+                    player.NameText().text = winner.PlayerName;
+                    player.NameText().transform.SetLocalZ(-15f);
                 }
 
                 SoundManager.Instance.PlaySound(__instance.DisconnectStinger, false, 1f);
@@ -105,6 +106,7 @@ public static bool Prefix(EndGameManager __instance)
             }
         }
 
+
         [HarmonyPatch(typeof(EndGameManager), nameof(EndGameManager.Start))]
         private class AdjustEndScreenPatch
         {

diff --git a/PeasAPI/CustomRpc/RpcCustomCheckColor.cs b/PeasAPI/CustomRpc/RpcCustomCheckColor.cs
@@ -1,6 +1,6 @@
 using Hazel;
-using Reactor;
-using Reactor.Networking;
+using Reactor.Networking.Rpc;
+using Reactor.Networking.Attributes;
 
 namespace PeasAPI.CustomRpc
 {

diff --git a/PeasAPI/CustomRpc/RpcCustomEndReason.cs b/PeasAPI/CustomRpc/RpcCustomEndReason.cs
@@ -2,8 +2,8 @@
 using System.Linq;
 using Hazel;
 using PeasAPI.CustomEndReason;
-using Reactor;
-using Reactor.Networking;
+using Reactor.Networking.Rpc;
+using Reactor.Networking.Attributes;
 using UnityEngine;
 
 namespace PeasAPI.CustomRpc
@@ -88,7 +88,7 @@ public override void Handle(PlayerControl innerNetObject, Data data)
             EndReasonManager.Stinger = data.Stinger;
 
             if (AmongUsClient.Instance.AmHost)
-                ShipStatus.RpcEndGame(EndReasonManager.CustomGameOverReason, false);
+                GameManager.Instance.RpcEndGame(EndReasonManager.CustomGameOverReason, false);
         }
     }
 }
diff --git a/PeasAPI/CustomRpc/RpcInitializeRoles.cs b/PeasAPI/CustomRpc/RpcInitializeRoles.cs
@@ -4,9 +4,9 @@
 using PeasAPI.CustomEndReason;
 using PeasAPI.GameModes;
 using PeasAPI.Roles;
-using Reactor;
-using Reactor.Extensions;
-using Reactor.Networking;
+using Reactor.Networking.Rpc;
+using Reactor.Networking.Attributes;
+using Reactor.Utilities.Extensions;
 
 namespace PeasAPI.CustomRpc
 {
@@ -27,7 +27,7 @@ public override void Handle(PlayerControl innerNetObject)
 
                 EndReasonManager.Reset();
 
-                if (AmongUsClient.Instance.GameMode != global::GameModes.FreePlay)
+                if (AmongUsClient.Instance.NetworkMode != global::NetworkModes.FreePlay)
                 {
                     var rolesForPlayers = new List<BaseRole>();
 

diff --git a/PeasAPI/CustomRpc/RpcResetRoles.cs b/PeasAPI/CustomRpc/RpcResetRoles.cs
@@ -1,6 +1,7 @@
 using PeasAPI.Roles;
-using Reactor;
-using Reactor.Networking;
+using Reactor.Networking.Rpc;
+using Reactor.Networking.Attributes;
+
 
 namespace PeasAPI.CustomRpc
 {

diff --git a/PeasAPI/CustomRpc/RpcSetColor.cs b/PeasAPI/CustomRpc/RpcSetColor.cs
@@ -1,6 +1,7 @@
 using Hazel;
-using Reactor;
-using Reactor.Networking;
+using Reactor.Networking.Rpc;
+using Reactor.Networking.Attributes;
+
 
 namespace PeasAPI.CustomRpc
 {

diff --git a/PeasAPI/CustomRpc/RpcSetRole.cs b/PeasAPI/CustomRpc/RpcSetRole.cs
@@ -1,7 +1,8 @@
 using Hazel;
 using PeasAPI.Roles;
-using Reactor;
-using Reactor.Networking;
+using Reactor.Networking.Rpc;
+using Reactor.Networking.Attributes;
+
 
 namespace PeasAPI.CustomRpc
 {

diff --git a/PeasAPI/CustomRpc/RpcSetVanillaRole.cs b/PeasAPI/CustomRpc/RpcSetVanillaRole.cs
@@ -1,6 +1,7 @@
 using Hazel;
-using Reactor;
-using Reactor.Networking;
+using Reactor.Networking.Rpc;
+using Reactor.Networking.Attributes;
+using AmongUs.GameOptions;
 
 namespace PeasAPI.CustomRpc
 {

diff --git a/PeasAPI/CustomRpc/RpcShowMessage.cs b/PeasAPI/CustomRpc/RpcShowMessage.cs
@@ -2,8 +2,8 @@
 using HarmonyLib;
 using Hazel;
 using PeasAPI.Managers;
-using Reactor;
-using Reactor.Networking;
+using Reactor.Networking.Rpc;
+using Reactor.Networking.Attributes;
 
 namespace PeasAPI.CustomRpc
 {

diff --git a/PeasAPI/CustomRpc/RpcUpdateSetting.cs b/PeasAPI/CustomRpc/RpcUpdateSetting.cs
@@ -1,7 +1,7 @@
 using Hazel;
 using PeasAPI.Options;
-using Reactor;
-using Reactor.Networking;
+using Reactor.Networking.Rpc;
+using Reactor.Networking.Attributes;
 
 namespace PeasAPI.CustomRpc
 {

diff --git a/PeasAPI/Data.cs b/PeasAPI/Data.cs
@@ -2,8 +2,9 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
-using Reactor.Extensions;
+using Reactor.Utilities.Extensions;
 using UnityEngine;
+using PeasAPI.Extensions;
 
 namespace PeasAPI
 {
@@ -34,6 +35,9 @@ public CustomIntroScreen(bool overrideTeam = false, string team = null, string t
                 RoleColor = roleColor.GetValueOrDefault();
             }
         }
+
+
+        /*
 
         public readonly struct Hat
         {
@@ -58,7 +62,8 @@ public Hat(string name, string imagePath, Assembly assembly, bool inFront, bool
                 FloorImage = floorImage;
             }
 
-            public HatData CreateHat()
+           // very hard so  maybe waiting TOU to update and get the code
+            public HatData CreateHat(HatParent __instance)
             {
                 try
                 {
@@ -68,8 +73,9 @@ public HatData CreateHat()
                     ImageConversion.LoadImage(tex, data, false);
 
                     var newHat = ScriptableObject.CreateInstance<HatData>();
-                    newHat.hatViewData.viewData = ScriptableObject.CreateInstance<HatViewData>();
-                    newHat.hatViewData.viewData.MainImage = newHat.hatViewData.viewData.LeftMainImage = Sprite.Create(
+                    var b = __instance.GetViewData();
+                    b.GetViewData() = ScriptableObject.CreateInstance<HatViewData>();
+                    newHat.CreateAddressableAsset().GetAsset().MainImage = newHat.CreateAddressableAsset().GetAsset().LeftMainImage = Sprite.Create(
                         tex,
                         new Rect(0, 0, tex.width, tex.height),
                         new Vector2(0.53f, 0.575f),
@@ -96,6 +102,7 @@ public HatData CreateHat()
                     PeasAPI.Logger.LogError($"Error while creating a hat: {e}");
                 }
 
+
                 return null;
             }
         }
@@ -118,6 +125,7 @@ public Visor(string name, string imagePath, Assembly assembly, Vector2 chipOffse
                 ClimbImage = climbImage;
                 FloorImage = floorImage;
             }
+
 
             public VisorData CreateVisor()
             {
@@ -129,7 +137,7 @@ public VisorData CreateVisor()
                     ImageConversion.LoadImage(tex, data, false);
 
                     var newVisor = ScriptableObject.CreateInstance<VisorData>();
-                    newVisor.viewData.viewData = ScriptableObject.CreateInstance<VisorViewData>();
+                    newVisor.CreateAddressableAsset().GetAsset(). = ScriptableObject.CreateInstance<VisorViewData>();
                     newVisor.viewData.viewData.IdleFrame = newVisor.viewData.viewData.LeftIdleFrame = Sprite.Create(
                         tex,
                         new Rect(0, 0, tex.width, tex.height),
@@ -156,5 +164,6 @@ public VisorData CreateVisor()
                 return null;
             }
         }
+        */
     }
 }