Merge pull request #67 from All-Of-Us-Mods/dev

0.3.0

MiraAPI.Example/Roles/NeutralKillerRole.cs

@@ -1,5 +1,4 @@
-using Il2CppInterop.Runtime.Attributes;
-using MiraAPI.Example.GameOver;
+using MiraAPI.Example.GameOver;
 using MiraAPI.GameEnd;
 using MiraAPI.Roles;
 using UnityEngine;
@@ -23,7 +22,6 @@ public class NeutralKillerRole : ImpostorRole, ICustomRole
 
     public RoleOptionsGroup RoleOptionsGroup { get; } = new("Outcast", Color.gray);
 
-    [HideFromIl2Cpp]
     public TeamIntroConfiguration? IntroConfiguration { get; } = new(
         Color.gray,
         "OUTCAST",

MiraAPI/Patches/Menu/HatsTabPatches.cs

@@ -6,13 +6,10 @@ using System.Linq;
 using AmongUs.Data;
 using HarmonyLib;
 using MiraAPI.Utilities;
-using MiraAPI.Utilities.Assets;
 using Reactor.Utilities;
 using Reactor.Utilities.Extensions;
 using TMPro;
 using UnityEngine;
-using UnityEngine.Events;
-using UnityEngine.UI;
 using Object = UnityEngine.Object;
 
 namespace MiraAPI.Patches.Menu;
@@ -23,20 +20,6 @@ public static class HatsTabPatches
     private static SortedList<string, List<HatData>> sortedHats = [];
     private static int currentPage;
 
-    private static void PreviousPage(HatsTab hatsTab)
-    {
-        currentPage--;
-        currentPage = currentPage < 0 ? sortedHats.Count - 1 : currentPage;
-        GenerateHats(hatsTab, currentPage);
-    }
-
-    private static void NextPage(HatsTab hatsTab)
-    {
-        currentPage++;
-        currentPage = currentPage > sortedHats.Count - 1 ? 0 : currentPage;
-        GenerateHats(hatsTab, currentPage);
-    }
-
     [HarmonyPatch(nameof(HatsTab.OnEnable))]
     [HarmonyPrefix]
     public static bool OnEnablePrefix(HatsTab __instance)
@@ -55,8 +38,6 @@ public static class HatsTabPatches
             }
         }
 
-        InventoryUtility.CreateNextBackButtons(__instance, PreviousPage, NextPage);
-
         GenerateHats(__instance, currentPage);
 
         return false;
@@ -64,17 +45,22 @@ public static class HatsTabPatches
 
     [HarmonyPatch(typeof(HatsTab), nameof(HatsTab.Update))]
     [HarmonyPrefix]
+
     public static void UpdatePrefix(HatsTab __instance)
     {
         if (sortedHats.Count == 0) return;
 
         if (Input.GetKeyDown(KeyCode.LeftControl) || Input.GetKeyDown(KeyCode.RightControl) || Input.GetKeyDown(KeyCode.LeftArrow))
         {
-            PreviousPage(__instance);
+            currentPage--;
+            currentPage = currentPage < 0 ? sortedHats.Count - 1 : currentPage;
+            GenerateHats(__instance, currentPage);
         }
         else if (Input.GetKeyDown(KeyCode.Tab) || Input.GetKeyDown(KeyCode.RightArrow))
         {
-            NextPage(__instance);
+            currentPage++;
+            currentPage = currentPage > sortedHats.Count - 1 ? 0 : currentPage;
+            GenerateHats(__instance, currentPage);
         }
     }
 
@@ -98,10 +84,10 @@ public static class HatsTabPatches
         text.gameObject.transform.localScale = Vector3.one;
         text.GetComponent<TextTranslatorTMP>().Destroy();
         text.EnableStencilMasking();
-        text.text = $"{groupName} ({currentPage + 1}/{sortedHats.Count})";
+        text.text = $"{groupName} ({currentPage + 1}/{sortedHats.Count})\nPress Ctrl or Tab to cycle pages";
         text.alignment = TextAlignmentOptions.Center;
-        text.fontSize = 5f;
-        text.fontSizeMax = 5f;
+        text.fontSize = 3f;
+        text.fontSizeMax = 3f;
         text.fontSizeMin = 0f;
         var xLerp = __instance.XRange.Lerp(0.5f);
         var yLerp = __instance.YStart - hatIndex / __instance.NumPerRow * __instance.YOffset;
@@ -139,17 +125,9 @@ public static class HatsTabPatches
     {
         var colorChip = Object.Instantiate(__instance.ColorTabPrefab, __instance.scroller.Inner);
         colorChip.gameObject.name = hat.ProductId;
-        if (ActiveInputManager.currentControlType == ActiveInputManager.InputType.Keyboard)
-        {
-            colorChip.Button.OnClick.AddListener((Action)__instance.ClickEquip);
-            colorChip.Button.OnMouseOver.AddListener((Action)(() => __instance.SelectHat(hat)));
-            colorChip.Button.OnMouseOut.AddListener((Action)(() => __instance.SelectHat(HatManager.Instance.GetHatById(DataManager.Player.Customization.Hat))));
-        }
-        else
-        {
-            colorChip.Button.OnClick.AddListener((Action)(() => __instance.SelectHat(hat)));
-        }
-
+        colorChip.Button.OnClick.AddListener((Action)(() => __instance.ClickEquip()));
+        colorChip.Button.OnMouseOver.AddListener((Action)(() => __instance.SelectHat(hat)));
+        colorChip.Button.OnMouseOut.AddListener((Action)(() => __instance.SelectHat(HatManager.Instance.GetHatById(DataManager.Player.Customization.Hat))));
         colorChip.Inner.SetHat(hat, __instance.HasLocalPlayer() ? PlayerControl.LocalPlayer.Data.DefaultOutfit.ColorId : DataManager.Player.Customization.Color);
         colorChip.Button.ClickMask = __instance.scroller.Hitbox;
         colorChip.SelectionHighlight.gameObject.SetActive(false);

MiraAPI/Patches/Menu/InventoryUtility.cs

@@ -1,54 +0,0 @@
-using System;
-using MiraAPI.Utilities.Assets;
-using TMPro;
-using UnityEngine;
-using UnityEngine.Events;
-using UnityEngine.UI;
-using Object = UnityEngine.Object;
-
-namespace MiraAPI.Patches.Menu;
-
-public static class InventoryUtility
-{
-    public static void CreateNextBackButtons<T>(T tab, Action<T> previousPage, Action<T> nextPage) where T : InventoryTab
-    {
-        var title = tab.transform.FindChild("Text");
-        title.localPosition = new Vector3(.9123f, -.23f, -55);
-        title.GetComponent<TextMeshPro>().alignment = TextAlignmentOptions.Center;
-
-        tab.scroller.Hitbox.transform.localScale -= new Vector3(0, 0.1f, 0);
-        tab.scroller.Hitbox.transform.localPosition -= new Vector3(0, 0.1f, 0);
-
-        var leftButtonElement = Object.Instantiate(PlayerCustomizationMenu.Instance.BackButton.gameObject, tab.transform);
-        var leftSpriteRenderer = leftButtonElement.GetComponent<SpriteRenderer>();
-        var leftButton = leftButtonElement.GetComponent<PassiveButton>();
-
-        leftButtonElement.transform.localPosition = new Vector3(-1.1f, -0.2f, -55);
-        leftSpriteRenderer.sprite = MiraAssets.NextButton.LoadAsset();
-        leftSpriteRenderer.flipX = true;
-
-        leftButton.OnMouseOver = new UnityEvent();
-        leftButton.OnMouseOver.AddListener((Action)(() => leftSpriteRenderer.sprite = MiraAssets.NextButtonActive.LoadAsset()));
-        leftButton.OnMouseOut = new UnityEvent();
-        leftButton.OnMouseOut.AddListener((Action)(() => leftSpriteRenderer.sprite = MiraAssets.NextButton.LoadAsset()));
-
-        leftButton.OnClick = new Button.ButtonClickedEvent();
-        leftButton.OnClick.AddListener((Action)(() => previousPage(tab)));
-
-        var rightButtonElement = Object.Instantiate(leftButtonElement, tab.transform);
-        var rightSpriteRenderer = rightButtonElement.GetComponent<SpriteRenderer>();
-        var rightButton = rightButtonElement.GetComponent<PassiveButton>();
-
-        rightButtonElement.transform.localPosition = new Vector3(2.8f, -0.2f, -55);
-        rightSpriteRenderer.sprite = MiraAssets.NextButton.LoadAsset();
-        rightSpriteRenderer.flipX = false;
-
-        rightButton.OnMouseOver = new UnityEvent();
-        rightButton.OnMouseOver.AddListener((Action)(() => rightSpriteRenderer.sprite = MiraAssets.NextButtonActive.LoadAsset()));
-        rightButton.OnMouseOut = new UnityEvent();
-        rightButton.OnMouseOut.AddListener((Action)(() => rightSpriteRenderer.sprite = MiraAssets.NextButton.LoadAsset()));
-
-        rightButton.OnClick = new Button.ButtonClickedEvent();
-        rightButton.OnClick.AddListener((Action)(() => nextPage(tab)));
-    }
-}

MiraAPI/Patches/Menu/NameplatesTabPatches.cs

@@ -26,20 +26,6 @@ public static class NameplatesTabPatches
         }
     }
 
-    private static void PreviousPage(NameplatesTab tab)
-    {
-        currentPage--;
-        currentPage = currentPage < 0 ? SortedNameplates.Count - 1 : currentPage;
-        GenerateHats(tab, currentPage);
-    }
-
-    private static void NextPage(NameplatesTab tab)
-    {
-        currentPage++;
-        currentPage = currentPage > SortedNameplates.Count - 1 ? 0 : currentPage;
-        GenerateHats(tab, currentPage);
-    }
-
     [HarmonyPatch(nameof(NameplatesTab.OnEnable))]
     [HarmonyPrefix]
     public static bool OnEnablePrefix(NameplatesTab __instance)
@@ -47,9 +33,6 @@ public static class NameplatesTabPatches
         __instance.plateId = HatManager.Instance.GetNamePlateById(DataManager.Player.Customization.namePlate).ProdId;
 
         if (!SortedNameplates.ContainsKey("Vanilla")) AddRange(DestroyableSingleton<HatManager>.Instance.GetUnlockedNamePlates().Select(x => ("Vanilla", x)));
-
-        InventoryUtility.CreateNextBackButtons(__instance, PreviousPage, NextPage);
-
         GenerateHats(__instance, currentPage);
 
         return false;
@@ -62,11 +45,15 @@ public static class NameplatesTabPatches
     {
         if (Input.GetKeyDown(KeyCode.LeftControl) || Input.GetKeyDown(KeyCode.RightControl) || Input.GetKeyDown(KeyCode.LeftArrow))
         {
-            PreviousPage(__instance);
+            currentPage--;
+            currentPage = currentPage < 0 ? SortedNameplates.Count - 1 : currentPage;
+            GenerateHats(__instance, currentPage);
         }
         else if (Input.GetKeyDown(KeyCode.Tab) || Input.GetKeyDown(KeyCode.RightArrow))
         {
-            NextPage(__instance);
+            currentPage++;
+            currentPage = currentPage > SortedNameplates.Count - 1 ? 0 : currentPage;
+            GenerateHats(__instance, currentPage);
         }
     }
 
@@ -86,10 +73,10 @@ public static class NameplatesTabPatches
         text.gameObject.transform.localScale = Vector3.one;
         text.GetComponent<TextTranslatorTMP>().Destroy();
         text.EnableStencilMasking();
-        text.text = $"{groupName} ({currentPage + 1}/{SortedNameplates.Count})";
+        text.text = $"{groupName} ({currentPage + 1}/{SortedNameplates.Count})\nPress Ctrl or Tab to cycle pages";
         text.alignment = TextAlignmentOptions.Center;
-        text.fontSize = 5f;
-        text.fontSizeMax = 5f;
+        text.fontSize = 3f;
+        text.fontSizeMax = 3f;
         text.fontSizeMin = 0f;
         float xLerp = __instance.XRange.Lerp(0.5f);
         float yLerp = __instance.YStart - hatIndex / __instance.NumPerRow * __instance.YOffset;
@@ -112,20 +99,9 @@ public static class NameplatesTabPatches
     {
         var colorChip = Object.Instantiate(__instance.ColorTabPrefab, __instance.scroller.Inner);
         colorChip.gameObject.name = namePlate.ProductId;
-
-        if (ActiveInputManager.currentControlType == ActiveInputManager.InputType.Keyboard)
-        {
-            colorChip.Button.OnClick.AddListener((Action)__instance.ClickEquip);
-            colorChip.Button.OnMouseOver.AddListener((Action)(() => __instance.SelectNameplate(namePlate)));
-            colorChip.Button.OnMouseOut.AddListener(
-                (Action)(() => __instance.SelectNameplate(
-                    HatManager.Instance.GetNamePlateById(DataManager.Player.Customization.NamePlate))));
-        }
-        else
-        {
-            colorChip.Button.OnClick.AddListener((Action)(() => __instance.SelectNameplate(namePlate)));
-        }
-
+        colorChip.Button.OnClick.AddListener((Action)(() => __instance.ClickEquip()));
+        colorChip.Button.OnMouseOver.AddListener((Action)(() => __instance.SelectNameplate(namePlate)));
+        colorChip.Button.OnMouseOut.AddListener((Action)(() => __instance.SelectNameplate(HatManager.Instance.GetNamePlateById(DataManager.Player.Customization.NamePlate))));
         colorChip.Button.ClickMask = __instance.scroller.Hitbox;
         colorChip.ProductId = namePlate.ProdId;
 

MiraAPI/Patches/Menu/SkinsTabPatches.cs

@@ -18,20 +18,6 @@ public static class SkinsTabPatches
     private static SortedList<string, List<SkinData>> sortedSkins = [];
     private static int currentPage;
 
-    private static void PreviousPage(SkinsTab tab)
-    {
-        currentPage--;
-        currentPage = currentPage < 0 ? sortedSkins.Count - 1 : currentPage;
-        GenerateHats(tab, currentPage);
-    }
-
-    private static void NextPage(SkinsTab tab)
-    {
-        currentPage++;
-        currentPage = currentPage > sortedSkins.Count - 1 ? 0 : currentPage;
-        GenerateHats(tab, currentPage);
-    }
-
     [HarmonyPatch(nameof(SkinsTab.OnEnable))]
     [HarmonyPrefix]
     public static bool OnEnablePrefix(SkinsTab __instance)
@@ -50,8 +36,6 @@ public static class SkinsTabPatches
             }
         }
 
-        InventoryUtility.CreateNextBackButtons(__instance, PreviousPage, NextPage);
-
         GenerateHats(__instance, currentPage);
 
         return false;
@@ -64,11 +48,15 @@ public static class SkinsTabPatches
     {
         if (Input.GetKeyDown(KeyCode.LeftControl) || Input.GetKeyDown(KeyCode.RightControl) || Input.GetKeyDown(KeyCode.LeftArrow))
         {
-            PreviousPage(__instance);
+            currentPage--;
+            currentPage = currentPage < 0 ? sortedSkins.Count - 1 : currentPage;
+            GenerateHats(__instance, currentPage);
         }
         else if (Input.GetKeyDown(KeyCode.Tab) || Input.GetKeyDown(KeyCode.RightArrow))
         {
-            NextPage(__instance);
+            currentPage++;
+            currentPage = currentPage > sortedSkins.Count - 1 ? 0 : currentPage;
+            GenerateHats(__instance, currentPage);
         }
     }
 
@@ -88,10 +76,10 @@ public static class SkinsTabPatches
         text.gameObject.transform.localScale = Vector3.one;
         text.GetComponent<TextTranslatorTMP>().Destroy();
         text.EnableStencilMasking();
-        text.text = $"{groupName} ({currentPage + 1}/{sortedSkins.Count})";
+        text.text = $"{groupName} ({currentPage + 1}/{sortedSkins.Count})\nPress Ctrl or Tab to cycle pages";
         text.alignment = TextAlignmentOptions.Center;
-        text.fontSize = 5f;
-        text.fontSizeMax = 5f;
+        text.fontSize = 3f;
+        text.fontSizeMax = 3f;
         text.fontSizeMin = 0f;
         float xLerp = __instance.XRange.Lerp(0.5f);
         float yLerp = __instance.YStart - hatIndex / __instance.NumPerRow * __instance.YOffset;
@@ -114,18 +102,9 @@ public static class SkinsTabPatches
     {
         var colorChip = Object.Instantiate(__instance.ColorTabPrefab, __instance.scroller.Inner);
         colorChip.gameObject.name = skin.ProductId;
-        if (ActiveInputManager.currentControlType == ActiveInputManager.InputType.Keyboard)
-        {
-            colorChip.Button.OnClick.AddListener((Action)__instance.ClickEquip);
-            colorChip.Button.OnMouseOver.AddListener((Action)(() => __instance.SelectSkin(skin)));
-            colorChip.Button.OnMouseOut.AddListener(
-                (Action)(() =>
-                    __instance.SelectSkin(HatManager.Instance.GetSkinById(DataManager.Player.Customization.Skin))));
-        }
-        else
-        {
-            colorChip.Button.OnClick.AddListener((Action)(() => __instance.SelectSkin(skin)));
-        }
+        colorChip.Button.OnClick.AddListener((Action)(() => __instance.ClickEquip()));
+        colorChip.Button.OnMouseOver.AddListener((Action)(() => __instance.SelectSkin(skin)));
+        colorChip.Button.OnMouseOut.AddListener((Action)(() => __instance.SelectSkin(HatManager.Instance.GetSkinById(DataManager.Player.Customization.Skin))));
         colorChip.Button.ClickMask = __instance.scroller.Hitbox;
         colorChip.ProductId = skin.ProductId;
         colorChip.SelectionHighlight.gameObject.SetActive(false);

MiraAPI/Patches/Menu/VisorsTabPatches.cs

@@ -25,21 +25,6 @@ public static class VisorsTabPatches
         }
     }
 
-    private static void PreviousPage(VisorsTab tab)
-    {
-        currentPage--;
-        currentPage = currentPage < 0 ? SortedVisors.Count - 1 : currentPage;
-        GenerateHats(tab, currentPage);
-    }
-
-    private static void NextPage(VisorsTab tab)
-    {
-        currentPage++;
-        currentPage = currentPage > SortedVisors.Count - 1 ? 0 : currentPage;
-        GenerateHats(tab, currentPage);
-    }
-
-
     [HarmonyPatch(nameof(VisorsTab.OnEnable))]
     [HarmonyPrefix]
     public static bool OnEnablePrefix(VisorsTab __instance)
@@ -47,9 +32,6 @@ public static class VisorsTabPatches
         __instance.visorId = HatManager.Instance.GetVisorById(DataManager.Player.Customization.Visor).ProdId;
 
         if (!SortedVisors.ContainsKey("Vanilla")) AddRange(DestroyableSingleton<HatManager>.Instance.GetUnlockedVisors().Select(x => ("Vanilla", x)));
-
-        InventoryUtility.CreateNextBackButtons(__instance, PreviousPage, NextPage);
-
         GenerateHats(__instance, currentPage);
 
         return false;
@@ -62,11 +44,15 @@ public static class VisorsTabPatches
     {
         if (Input.GetKeyDown(KeyCode.LeftControl) || Input.GetKeyDown(KeyCode.RightControl) || Input.GetKeyDown(KeyCode.LeftArrow))
         {
-            PreviousPage(__instance);
+            currentPage--;
+            currentPage = currentPage < 0 ? SortedVisors.Count - 1 : currentPage;
+            GenerateHats(__instance, currentPage);
         }
         else if (Input.GetKeyDown(KeyCode.Tab) || Input.GetKeyDown(KeyCode.RightArrow))
         {
-            NextPage(__instance);
+            currentPage++;
+            currentPage = currentPage > SortedVisors.Count - 1 ? 0 : currentPage;
+            GenerateHats(__instance, currentPage);
         }
     }
 
@@ -86,10 +72,10 @@ public static class VisorsTabPatches
         text.gameObject.transform.localScale = Vector3.one;
         text.GetComponent<TextTranslatorTMP>().Destroy();
         text.EnableStencilMasking();
-        text.text = $"{groupName} ({currentPage + 1}/{SortedVisors.Count})";
+        text.text = $"{groupName} ({currentPage + 1}/{SortedVisors.Count})\nPress Ctrl or Tab to cycle pages";
         text.alignment = TextAlignmentOptions.Center;
-        text.fontSize = 5f;
-        text.fontSizeMax = 5f;
+        text.fontSize = 3f;
+        text.fontSizeMax = 3f;
         text.fontSizeMin = 0f;
         float xLerp = __instance.XRange.Lerp(0.5f);
         float yLerp = __instance.YStart - hatIndex / __instance.NumPerRow * __instance.YOffset;
@@ -112,20 +98,9 @@ public static class VisorsTabPatches
     {
         var colorChip = Object.Instantiate(__instance.ColorTabPrefab, __instance.scroller.Inner);
         colorChip.gameObject.name = visor.ProductId;
-
-        if (ActiveInputManager.currentControlType == ActiveInputManager.InputType.Keyboard)
-        {
-            colorChip.Button.OnClick.AddListener((Action)__instance.ClickEquip);
-            colorChip.Button.OnMouseOver.AddListener((Action)(() => __instance.SelectVisor(visor)));
-            colorChip.Button.OnMouseOut.AddListener(
-                (Action)(() =>
-                    __instance.SelectVisor(HatManager.Instance.GetVisorById(DataManager.Player.Customization.Visor))));
-        }
-        else
-        {
-            colorChip.Button.OnClick.AddListener((Action)(() => __instance.SelectVisor(visor)));
-        }
-
+        colorChip.Button.OnClick.AddListener((Action)(() => __instance.ClickEquip()));
+        colorChip.Button.OnMouseOver.AddListener((Action)(() => __instance.SelectVisor(visor)));
+        colorChip.Button.OnMouseOut.AddListener((Action)(() => __instance.SelectVisor(HatManager.Instance.GetVisorById(DataManager.Player.Customization.Visor))));
         colorChip.Button.ClickMask = __instance.scroller.Hitbox;
         colorChip.ProductId = visor.ProductId;
         colorChip.SelectionHighlight.gameObject.SetActive(false);

MiraAPI/Utilities/Assets/MiraAssets.cs

@@ -12,7 +12,7 @@ public static class MiraAssets
     {
         var boxTex = SpriteTools.LoadTextureFromResourcePath(
             "MiraAPI.Resources.RoundedBox.png",
-            System.Reflection.Assembly.GetExecutingAssembly());
+            System.Reflection.Assembly.GetCallingAssembly());
         var boxSprite = Sprite.Create(
             boxTex,
             new Rect(0, 0, boxTex.width, boxTex.height),