General improvements (#53)

General code improvements
Minor fixes

---------

Co-authored-by: Galster-dev <46283010+Galster-dev@users.noreply.github.com>

Author: AlchlcDvl

.gitignore

@@ -352,4 +352,7 @@ MigrationBackup/
 # Ionide (cross platform F# VS Code tools) working folder
 .ionide/
 Libs/*.dll
-RemovePlayerLimit/RemovePlayerLimit.csproj
+RemovePlayerLimit/RemovePlayerLimit.csproj
+
+# VSC Stuff
+.vscode/

src/CrowdedMod/Components/AbstractPagingBehaviour.cs

@@ -5,15 +5,17 @@ namespace CrowdedMod.Components;
 
 // Interface until unhollower implements generic il2cpp (if it's possible)
 /// <summary>
-/// This class is not actually abstract because unhollower does not support it <br/>
-/// You need to implement <see cref="OnPageChanged"/> and <see cref="MaxPageIndex"/>
+/// This class is not actually abstract because unhollower does not support it.<br/>
+/// You need to implement <see cref="OnPageChanged"/> and <see cref="MaxPageIndex"/>.
 /// </summary>
 public class AbstractPagingBehaviour : MonoBehaviour
 {
     public AbstractPagingBehaviour(IntPtr ptr) : base(ptr)
     {
     }
 
+    public const string PAGE_INDEX_GAME_OBJECT_NAME = "CrowdedMod_PageIndex";
+
     private int _page;
 
     public virtual int MaxPerPage => 15;
@@ -34,20 +36,23 @@ public virtual int PageIndex
 
     public virtual void OnPageChanged() => throw new NotImplementedException();
 
-    public void Start()
+    public virtual void Start() => OnPageChanged();
+
+    public virtual void Update()
     {
-        OnPageChanged();
+        if (Input.GetKeyDown(KeyCode.UpArrow) || Input.GetKeyDown(KeyCode.LeftArrow) || Input.mouseScrollDelta.y > 0f)
+            Cycle(false);
+        else if (Input.GetKeyDown(KeyCode.DownArrow) || Input.GetKeyDown(KeyCode.RightArrow) || Input.mouseScrollDelta.y < 0f)
+            Cycle(true);
     }
 
-    public virtual void Update()
+    /// <summary>
+    /// Loops around if you go over the limits.<br/>
+    /// Attempting to go up a page while on the first page will take you to the last page and vice versa.
+    /// </summary>
+    public virtual void Cycle(bool increment)
     {
-        if (Input.GetKeyDown(KeyCode.UpArrow) || Input.mouseScrollDelta.y > 0f)
-        {
-            PageIndex = Mathf.Clamp(PageIndex - 1, 0, MaxPageIndex);
-        }
-        else if (Input.GetKeyDown(KeyCode.DownArrow) || Input.mouseScrollDelta.y < 0f)
-        {
-            PageIndex = Mathf.Clamp(PageIndex + 1, 0, MaxPageIndex);
-        }
+        var change = increment ? 1 : -1;
+        PageIndex = Mathf.Clamp(PageIndex + change, 0, MaxPageIndex);
     }
 }

src/CrowdedMod/Components/MeetingHudPagingBehaviour.cs

@@ -20,15 +20,15 @@ public MeetingHudPagingBehaviour(IntPtr ptr) : base(ptr)
     public IEnumerable<PlayerVoteArea> Targets => meetingHud.playerStates.OrderBy(p => p.AmDead);
     public override int MaxPageIndex => (Targets.Count() - 1) / MaxPerPage;
 
+    public override void Start() => OnPageChanged();
+
     public override void Update()
     {
         base.Update();
 
-        if (meetingHud.state is MeetingHud.VoteStates.Animating or MeetingHud.VoteStates.Proceeding)
-        {
-            return; // TimerText does not update there
-        }
-        
+        if (meetingHud.state is MeetingHud.VoteStates.Animating or MeetingHud.VoteStates.Proceeding || meetingHud.TimerText.text.Contains($" ({PageIndex + 1}/{MaxPageIndex + 1})"))
+            return; // TimerText does not update there                                                 ^ Sometimes the timer text is spammed with the page counter for some weird reason so this is just a band-aid fix for it
+
         meetingHud.TimerText.text += $" ({PageIndex + 1}/{MaxPageIndex + 1})";
     }
 
@@ -42,11 +42,12 @@ public override void OnPageChanged()
 
                 var relativeIndex = i % MaxPerPage;
                 var row = relativeIndex / 3;
+                var col = relativeIndex % 3;
                 var buttonTransform = button.transform;
                 buttonTransform.localPosition = meetingHud.VoteOrigin +
                                           new Vector3(
-                                              meetingHud.VoteButtonOffsets.x * (relativeIndex % 3),
-                                              meetingHud.VoteButtonOffsets.y * row, 
+                                              meetingHud.VoteButtonOffsets.x * col,
+                                              meetingHud.VoteButtonOffsets.y * row,
                                               buttonTransform.localPosition.z
                                           );
             } else {

src/CrowdedMod/Components/ShapeShifterPagingBehaviour.cs

@@ -3,6 +3,7 @@
 using System.Linq;
 using Il2CppInterop.Runtime.Attributes;
 using Reactor.Utilities.Attributes;
+using TMPro;
 using UnityEngine;
 
 namespace CrowdedMod.Components;
@@ -19,9 +20,22 @@ public ShapeShifterPagingBehaviour(IntPtr ptr) : base(ptr)
     public IEnumerable<ShapeshifterPanel> Targets => shapeshifterMinigame.potentialVictims.ToArray();
 
     public override int MaxPageIndex => (Targets.Count() - 1) / MaxPerPage;
+    private TextMeshPro PageText = null!;
+
+    public override void Start()
+    {
+        PageText = Instantiate(HudManager.Instance.KillButton.cooldownTimerText, shapeshifterMinigame.transform);
+        PageText.name = PAGE_INDEX_GAME_OBJECT_NAME;
+        PageText.enableWordWrapping = false;
+        PageText.gameObject.SetActive(true);
+        PageText.transform.localPosition = new Vector3(4.1f, -2.36f, -1f);
+        PageText.transform.localScale *= 0.5f;
+        OnPageChanged();
+    }
 
     public override void OnPageChanged()
     {
+        PageText.text = $"({PageIndex + 1}/{MaxPageIndex + 1})";
         var i = 0;
 
         foreach (var panel in Targets)
@@ -31,10 +45,11 @@ public override void OnPageChanged()
 
                 var relativeIndex = i % MaxPerPage;
                 var row = relativeIndex / 3;
+                var col = relativeIndex % 3;
                 var buttonTransform = panel.transform;
                 buttonTransform.localPosition = new Vector3(
-                                                    shapeshifterMinigame.XStart + shapeshifterMinigame.XOffset * (relativeIndex % 3),
-                                                    shapeshifterMinigame.YStart + shapeshifterMinigame.YOffset * row, 
+                                                    shapeshifterMinigame.XStart + shapeshifterMinigame.XOffset * col,
+                                                    shapeshifterMinigame.YStart + shapeshifterMinigame.YOffset * row,
                                                     buttonTransform.localPosition.z
                                                 );
             } else {

src/CrowdedMod/Components/VitalsPagingBehaviour.cs

@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Il2CppInterop.Runtime.Attributes;
+using TMPro;
+using Reactor.Utilities.Attributes;
+using UnityEngine;
+
+namespace CrowdedMod.Components;
+
+[RegisterInIl2Cpp]
+public class VitalsPagingBehaviour : AbstractPagingBehaviour
+{
+    public VitalsPagingBehaviour(IntPtr ptr) : base(ptr) {}
+
+    public VitalsMinigame vitalsMinigame = null!;
+
+    [HideFromIl2Cpp]
+    public IEnumerable<VitalsPanel> Targets => vitalsMinigame.vitals.ToArray();
+    public override int MaxPageIndex => (Targets.Count() - 1) / MaxPerPage;
+    private TextMeshPro PageText = null!;
+
+    public override void Start()
+    {
+        PageText = Instantiate(HudManager.Instance.KillButton.cooldownTimerText, vitalsMinigame.transform);
+        PageText.name = PAGE_INDEX_GAME_OBJECT_NAME;
+        PageText.enableWordWrapping = false;
+        PageText.gameObject.SetActive(true);
+        PageText.transform.localPosition = new Vector3(2.7f, -2f, -1f);
+        PageText.transform.localScale *= 0.5f;
+        OnPageChanged();
+    }
+
+    public override void OnPageChanged()
+    {
+        if (PlayerTask.PlayerHasTaskOfType<HudOverrideTask>(PlayerControl.LocalPlayer))
+            return;
+
+        PageText.text = $"({PageIndex + 1}/{MaxPageIndex + 1})";
+        var i = 0;
+
+        foreach (var panel in Targets)
+        {
+            if (i >= PageIndex * MaxPerPage && i < (PageIndex + 1) * MaxPerPage)
+            {
+                panel.gameObject.SetActive(true);
+                var relativeIndex = i % MaxPerPage;
+                var row = relativeIndex / 3;
+                var col = relativeIndex % 3;
+                var panelTransform = panel.transform;
+                panelTransform.localPosition = new Vector3(
+                                                    vitalsMinigame.XStart + vitalsMinigame.XOffset * col,
+                                                    vitalsMinigame.YStart + vitalsMinigame.YOffset * row,
+                                                    panelTransform.localPosition.z
+                                                );
+            }
+            else
+                panel.gameObject.SetActive(false);
+
+            i++;
+        }
+    }
+}

src/CrowdedMod/CrowdedMod.csproj

@@ -8,6 +8,7 @@
         <LangVersion>latest</LangVersion>
         <DebugType>embedded</DebugType>
         <Nullable>enable</Nullable>
+        <AmongUs>H:\amogus\latest idfk\Among Us</AmongUs>
     </PropertyGroup>
     <PropertyGroup>
         <GamePlatform Condition="'$(GamePlatform)' == ''">Steam</GamePlatform>

src/CrowdedMod/CrowdedModPlugin.cs

@@ -4,26 +4,28 @@
 using BepInEx.Unity.IL2CPP;
 using HarmonyLib;
 using Reactor;
+using Reactor.Networking;
+using Reactor.Networking.Attributes;
 
-namespace CrowdedMod {
-    [BepInAutoPlugin("xyz.crowdedmods.crowdedmod")]
-    [BepInProcess("Among Us.exe")]
-    [BepInDependency(ReactorPlugin.Id)]
-    [BepInDependency("gg.reactor.debugger", BepInDependency.DependencyFlags.SoftDependency)] // fix debugger overwriting MinPlayers
-    public partial class CrowdedModPlugin : BasePlugin
-    {
-        public const int MaxPlayers = 127;
-        public const int MaxImpostors = 127 / 2;
-        
-        private Harmony Harmony { get; } = new (Id);
+namespace CrowdedMod;
+
+[BepInAutoPlugin("xyz.crowdedmods.crowdedmod")]
+[BepInProcess("Among Us.exe")]
+[BepInDependency(ReactorPlugin.Id)]
+[ReactorModFlags(ModFlags.RequireOnAllClients)]
+[BepInDependency("gg.reactor.debugger", BepInDependency.DependencyFlags.SoftDependency)] // fix debugger overwriting MinPlayers
+public partial class CrowdedModPlugin : BasePlugin
+{
+    public const int MaxPlayers = 127;
+    public const int MaxImpostors = 127 / 2;
 
-        public override void Load()
-        {
-            NormalGameOptionsV07.RecommendedImpostors = NormalGameOptionsV07.MaxImpostors = Enumerable.Repeat(127, 127).ToArray();
-            NormalGameOptionsV07.MinPlayers = Enumerable.Repeat(4, 127).ToArray();
+    private Harmony Harmony { get; } = new (Id);
 
+    public override void Load()
+    {
+        NormalGameOptionsV07.RecommendedImpostors = NormalGameOptionsV07.MaxImpostors = Enumerable.Repeat(127, 127).ToArray();
+        NormalGameOptionsV07.MinPlayers = Enumerable.Repeat(4, 127).ToArray();
 
-            Harmony.PatchAll();
-        }
+        Harmony.PatchAll();
     }
-}
+}

src/CrowdedMod/Net/SetColorRpc.cs

@@ -1,5 +1,4 @@
-using CrowdedMod;
-using Hazel;
+using Hazel;
 using Reactor.Networking.Attributes;
 using Reactor.Networking.Rpc;
 namespace CrowdedMod.Net;