hashing and clean up

Priscillalala · Dec 29, 2023 · f0a65f7 · f0a65f7
1 parent db3f12c
commit f0a65f7
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 51 deletions.
diff --git a/R2API.ProcType.Patcher/ProcTypePatcher.cs b/R2API.ProcType.Patcher/ProcTypePatcher.cs
@@ -2,14 +2,11 @@
 using BepInEx.Logging;
 using Mono.Cecil;
 using System.Collections.Generic;
-using System.Net;
 
 namespace R2API;
 
 public static class ProcTypePatcher
 {
-    private static readonly ManualLogSource logger = Logger.CreateLogSource("ProcTypePatcher");
-
     public static IEnumerable<string> TargetDLLs
     {
         get
@@ -20,10 +17,7 @@ public static IEnumerable<string> TargetDLLs
 
     public static void Patch(AssemblyDefinition assembly)
     {
-        logger.LogInfo("Patching!");
         TypeDefinition procChainMask = assembly.MainModule.GetType("RoR2", "ProcChainMask");
-        logger.LogInfo(procChainMask.FullName);
-        procChainMask.Fields.Add(new FieldDefinition("r2api_moddedMask", FieldAttributes.Public, assembly.MainModule.ImportReference(typeof(bool[]))));
-        logger.LogInfo("Done!");
+        procChainMask?.Fields.Add(new FieldDefinition("r2api_moddedMask", FieldAttributes.Public, assembly.MainModule.ImportReference(typeof(bool[]))));
     }
 }
diff --git a/R2API.ProcType/ProcTypeAPI.cs b/R2API.ProcType/ProcTypeAPI.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Runtime.CompilerServices;
 using System.Text;
 using HG;
 using Mono.Cecil.Cil;
@@ -9,13 +10,10 @@
 using RoR2;
 using UnityEngine;
 using UnityEngine.Networking;
-using UnityEngine.UIElements;
 
 namespace R2API;
 
-#pragma warning disable CS0436 // Type conflicts with imported type
 [AutoVersion]
-#pragma warning restore CS0436 // Type conflicts with imported type
 public static partial class ProcTypeAPI
 {
     public const string PluginGUID = R2API.PluginGUID + ".proctype";
@@ -49,28 +47,6 @@ private set
     private static int remainingBitCount;
     private static bool[] buffer;
     #endregion
-    private static NetworkSettings _networkSettings;
-
-    internal struct NetworkSettings
-    {
-        internal int totalByteCount;
-        internal int filledByteCount;
-        internal int remainingBitCount;
-        internal bool[] buffer;
-
-        internal void Update()
-        {
-
-        }
-
-        internal NetworkSettings(int length)
-        {
-            totalByteCount = length + 7 >> 3;
-            filledByteCount = totalByteCount - 1;
-            remainingBitCount = length - (filledByteCount << 3);
-            buffer = new bool[length];
-        }
-    }
 
     #region API
     public static ModdedProcType ReserveProcType()
@@ -251,9 +227,7 @@ private static ProcChainMask NetworkExtensions_ReadProcChainMask(On.RoR2.Network
 
     private static int ProcChainMask_GetHashCode(On.RoR2.ProcChainMask.orig_GetHashCode orig, ref ProcChainMask self)
     {
-        bool[] mask = ProcTypeInterop.GetModdedMask(self);
-
-        return orig(ref self) * 397 ^ ProcTypeInterop.GetModdedMask(self).GetHashCode();
+        return orig(ref self) * 397 ^ ModdedMaskHashCode(ProcTypeInterop.GetModdedMask(self));
     }
 
     private static bool ProcChainMask_Equals_ProcChainMask(On.RoR2.ProcChainMask.orig_Equals_ProcChainMask orig, ref ProcChainMask self, ProcChainMask other)
@@ -269,41 +243,32 @@ private static void Init()
         buffer = new bool[ModdedProcTypeCount];
     }
 
-    private static void UpdateNetworkSettings()
-    {
-        totalByteCount = ModdedProcTypeCount + 7 >> 3;
-        filledByteCount = totalByteCount - 1;
-        remainingBitCount = ModdedProcTypeCount - (filledByteCount << 3);
-        if (buffer != null)
-        {
-            Array.Resize(ref buffer, ModdedProcTypeCount);
-        }
-    }
-
-    private static void NetworkWriteModdedMask(this NetworkWriter writer, bool[] values)
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static void NetworkWriteModdedMask(this NetworkWriter writer, bool[] mask)
     {
-        int valuesIndex = 0;
+        int maskIndex = 0;
         for (int i = 0; i < totalByteCount; i++)
         {
             byte b = 0;
-            if (values == null || valuesIndex < values.Length)
+            if (mask == null || maskIndex < mask.Length)
             {
                 int validBitCount = (i < filledByteCount) ? 8 : remainingBitCount;
                 int bitIndex = 0;
                 while (bitIndex < validBitCount)
                 {
-                    if (ArrayUtils.GetSafe(values, valuesIndex))
+                    if (ArrayUtils.GetSafe(mask, maskIndex))
                     {
                         b |= (byte)(1 << bitIndex);
                     }
                     bitIndex++;
-                    valuesIndex++;
+                    maskIndex++;
                 }
             }
             writer.Write(b);
         }
     }
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private static bool[] NetworkReadModdedMask(NetworkReader reader)
     {
         int finalLength = 0;
@@ -332,6 +297,25 @@ private static bool[] NetworkReadModdedMask(NetworkReader reader)
         return result;
     }
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static byte ModdedMaskHashCode(bool[] mask)
+    {
+        byte b = 0;
+        if (mask != null)
+        {
+            int length = Math.Min(mask.Length, 8);
+            for (int i = 0; i < length; i++)
+            {
+                if (mask[i])
+                {
+                    b |= (byte)(1 << i);
+                }
+            }
+        }
+        return b;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private static bool ModdedMaskEquals(bool[] a, bool[] b)
     {
         if (a == null)