Code Cleanup

Pinkstink-Rust · Feb 21, 2021 · 789e23e · 789e23e
1 parent 55509e3
commit 789e23e
Show file tree

Hide file tree

Showing 17 changed files with 195 additions and 156 deletions.
diff --git a/deps/0Harmony.dll b/deps/0Harmony.dll
diff --git a/deps/Rust.Harmony.dll b/deps/Rust.Harmony.dll
diff --git a/harmony2_override/0Harmony.dll b/harmony2_override/0Harmony.dll
diff --git a/harmony2_override/Rust.Harmony.dll b/harmony2_override/Rust.Harmony.dll
diff --git a/src/RustServerMetrics/Harmony/TimeWarning/Dispose_Patch.cs b/src/RustServerMetrics/Harmony/TimeWarning/Dispose_Patch.cs
diff --git a/src/RustServerMetrics/Harmony/TimeWarning/New_Patch.cs b/src/RustServerMetrics/Harmony/TimeWarning/New_Patch.cs
diff --git a/...armony/BasePlayer/OnDisconnected_Patch.cs → ...atches/BasePlayer_OnDisconnected_Patch.cs b/...armony/BasePlayer/OnDisconnected_Patch.cs → ...atches/BasePlayer_OnDisconnected_Patch.cs
@@ -1,22 +1,23 @@
-using Harmony;
+using HarmonyLib;
 using System.Collections.Generic;
+using System.Reflection;
 using System.Reflection.Emit;
 
-namespace RustServerMetrics.Harmony.BasePlayer
+namespace RustServerMetrics.HarmonyPatches
 {
-    [HarmonyPatch(typeof(global::BasePlayer), nameof(global::BasePlayer.OnDisconnected))]
-    public class OnDisconnected_Patch
+    [HarmonyPatch(typeof(BasePlayer), nameof(BasePlayer.OnDisconnected))]
+    public class BasePlayer_OnDisconnected_Patch
     {
         [HarmonyTranspiler]
         public static IEnumerable<CodeInstruction> Transpile(IEnumerable<CodeInstruction> originalInstructions)
         {
             List<CodeInstruction> retList = new List<CodeInstruction>(originalInstructions);
 
             var fieldInfo = typeof(SingletonComponent<MetricsLogger>)
-                .GetField(nameof(SingletonComponent<MetricsLogger>.Instance), System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.Public);
+                .GetField(nameof(SingletonComponent<MetricsLogger>.Instance), BindingFlags.Static | BindingFlags.Public);
 
             var methodInfo = typeof(MetricsLogger)
-                .GetMethod(nameof(MetricsLogger.OnPlayerDisconnected), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
+                .GetMethod(nameof(MetricsLogger.OnPlayerDisconnected), BindingFlags.Instance | BindingFlags.NonPublic);
 
             retList.InsertRange(0, new List<CodeInstruction>
             {

diff --git a/...cs/Harmony/BasePlayer/PlayerInit_Patch.cs → ...onyPatches/BasePlayer_PlayerInit_Patch.cs b/...cs/Harmony/BasePlayer/PlayerInit_Patch.cs → ...onyPatches/BasePlayer_PlayerInit_Patch.cs
@@ -1,24 +1,24 @@
-using Harmony;
+using HarmonyLib;
 using System;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Reflection.Emit;
 
-namespace RustServerMetrics.Harmony.BasePlayer
+namespace RustServerMetrics.HarmonyPatches
 {
-    [HarmonyPatch(typeof(global::BasePlayer), nameof(global::BasePlayer.PlayerInit))]
-    public class PlayerInit_Patch
+    [HarmonyPatch(typeof(BasePlayer), nameof(BasePlayer.PlayerInit))]
+    public class BasePlayer_PlayerInit_Patch
     {
         [HarmonyTranspiler]
         public static IEnumerable<CodeInstruction> Transpile(IEnumerable<CodeInstruction> originalInstructions)
         {
             List<CodeInstruction> retList = new List<CodeInstruction>(originalInstructions);
 
             var fieldInfo = typeof(SingletonComponent<MetricsLogger>)
-                .GetField(nameof(SingletonComponent<MetricsLogger>.Instance), System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.Public);
+                .GetField(nameof(SingletonComponent<MetricsLogger>.Instance), BindingFlags.Static | BindingFlags.Public);
 
             var methodInfo = typeof(MetricsLogger)
-                .GetMethod(nameof(MetricsLogger.OnPlayerInit), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
+                .GetMethod(nameof(MetricsLogger.OnPlayerInit), BindingFlags.Instance | BindingFlags.NonPublic);
 
             var idx = retList.FindIndex(x => x.opcode == OpCodes.Call && x.operand is MethodInfo methodInfo1 && methodInfo1.DeclaringType.Name == "EACServer" && methodInfo1.Name == "OnStartLoading");
 

diff --git a/...rMetrics/Harmony/Bootstrap/StartServer.cs → ...onyPatches/Bootstrap_StartServer_Patch.cs b/...rMetrics/Harmony/Bootstrap/StartServer.cs → ...onyPatches/Bootstrap_StartServer_Patch.cs
@@ -1,23 +1,20 @@
-using Harmony;
-using System;
+using HarmonyLib;
 using System.Collections.Generic;
-using System.Linq;
+using System.Reflection;
 using System.Reflection.Emit;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace RustServerMetrics.Harmony.Bootstrap
+namespace RustServerMetrics.HarmonyPatches
 {
-    [HarmonyPatch(typeof(global::Bootstrap), nameof(global::Bootstrap.StartServer))]
-    public class StartServer_Patch
+    [HarmonyPatch(typeof(Bootstrap), nameof(Bootstrap.StartServer))]
+    public class Bootstrap_StartServer_Patch
     {
         [HarmonyTranspiler]
         public static IEnumerable<CodeInstruction> Transpile(IEnumerable<CodeInstruction> originalInstructions)
         {
             List<CodeInstruction> retList = new List<CodeInstruction>(originalInstructions);
 
             var methodInfo = typeof(MetricsLogger)
-                .GetMethod(nameof(MetricsLogger.Initialize), System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.NonPublic);
+                .GetMethod(nameof(MetricsLogger.Initialize), BindingFlags.Static | BindingFlags.NonPublic);
 
             retList.InsertRange(0, new List<CodeInstruction>
             {

diff --git a/...etrics/Harmony/NetWrite/PacketID_Patch.cs → ...HarmonyPatches/NetWrite_PacketID_Patch.cs b/...etrics/Harmony/NetWrite/PacketID_Patch.cs → ...HarmonyPatches/NetWrite_PacketID_Patch.cs
@@ -1,22 +1,24 @@
-using Harmony;
+using HarmonyLib;
+using Network;
 using System.Collections.Generic;
+using System.Reflection;
 using System.Reflection.Emit;
 
-namespace RustServerMetrics.Harmony.NetWrite
+namespace RustServerMetrics.HarmonyPatches
 {
-    [HarmonyPatch(typeof(Network.NetWrite), nameof(Network.NetWrite.PacketID))]
-    public class PacketID_Patch
+    [HarmonyPatch(typeof(NetWrite), nameof(NetWrite.PacketID))]
+    public class NetWrite_PacketID_Patch
     {
         [HarmonyTranspiler]
         public static IEnumerable<CodeInstruction> Transpile(IEnumerable<CodeInstruction> originalInstructions)
         {
             List<CodeInstruction> retList = new List<CodeInstruction>(originalInstructions);
 
             var fieldInfo = typeof(SingletonComponent<MetricsLogger>)
-                .GetField(nameof(SingletonComponent<MetricsLogger>.Instance), System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.Public);
+                .GetField(nameof(SingletonComponent<MetricsLogger>.Instance), BindingFlags.Static | BindingFlags.Public);
 
             var methodInfo = typeof(MetricsLogger)
-                .GetMethod(nameof(MetricsLogger.OnNetWritePacketID), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
+                .GetMethod(nameof(MetricsLogger.OnNetWritePacketID), BindingFlags.Instance | BindingFlags.NonPublic);
 
             retList.InsertRange(retList.Count - 1, new List<CodeInstruction>
             {

diff --git a/...verMetrics/Harmony/NetWrite/Send_Patch.cs → ...ics/HarmonyPatches/NetWrite_Send_Patch.cs b/...verMetrics/Harmony/NetWrite/Send_Patch.cs → ...ics/HarmonyPatches/NetWrite_Send_Patch.cs
@@ -1,22 +1,24 @@
-using Harmony;
+using HarmonyLib;
+using Network;
 using System.Collections.Generic;
+using System.Reflection;
 using System.Reflection.Emit;
 
-namespace RustServerMetrics.Harmony.NetWrite
+namespace RustServerMetrics.HarmonyPatches
 {
-    [HarmonyPatch(typeof(Network.NetWrite), nameof(Network.NetWrite.Send))]
-    public class Send_Patch
+    [HarmonyPatch(typeof(NetWrite), nameof(NetWrite.Send))]
+    public class NetWrite_Send_Patch
     {
         [HarmonyTranspiler]
         public static IEnumerable<CodeInstruction> Transpile(IEnumerable<CodeInstruction> originalInstructions)
         {
             List<CodeInstruction> retList = new List<CodeInstruction>(originalInstructions);
 
             var fieldInfo = typeof(SingletonComponent<MetricsLogger>)
-                .GetField(nameof(SingletonComponent<MetricsLogger>.Instance), System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.Public);
+                .GetField(nameof(SingletonComponent<MetricsLogger>.Instance), BindingFlags.Static | BindingFlags.Public);
 
             var methodInfo = typeof(MetricsLogger)
-                .GetMethod(nameof(MetricsLogger.OnNetWriteSend), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
+                .GetMethod(nameof(MetricsLogger.OnNetWriteSend), BindingFlags.Instance | BindingFlags.NonPublic);
 
             retList.InsertRange(retList.Count - 1, new List<CodeInstruction>
             {

diff --git a/...ics/Harmony/Performance/FPSTimer_Patch.cs → ...monyPatches/Performance_FPSTimer_Patch.cs b/...ics/Harmony/Performance/FPSTimer_Patch.cs → ...monyPatches/Performance_FPSTimer_Patch.cs
@@ -1,22 +1,23 @@
-using Harmony;
+using HarmonyLib;
 using System.Collections.Generic;
+using System.Reflection;
 using System.Reflection.Emit;
 
-namespace RustServerMetrics.Harmony.Performance
+namespace RustServerMetrics.HarmonyPatches
 {
-    [HarmonyPatch(typeof(global::Performance), "FPSTimer")]
-    public class FPSTimer_Patch
+    [HarmonyPatch(typeof(Performance), "FPSTimer")]
+    public class Performance_FPSTimer_Patch
     {
         [HarmonyTranspiler]
         public static IEnumerable<CodeInstruction> Transpile(IEnumerable<CodeInstruction> originalInstructions)
         {
             List<CodeInstruction> retList = new List<CodeInstruction>(originalInstructions);
 
             var fieldInfo = typeof(SingletonComponent<MetricsLogger>)
-                .GetField(nameof(SingletonComponent<MetricsLogger>.Instance), System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.Public);
+                .GetField(nameof(SingletonComponent<MetricsLogger>.Instance), BindingFlags.Static | BindingFlags.Public);
 
             var methodInfo = typeof(MetricsLogger)
-                .GetMethod(nameof(MetricsLogger.OnPerformanceReportGenerated), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
+                .GetMethod(nameof(MetricsLogger.OnPerformanceReportGenerated), BindingFlags.Instance | BindingFlags.NonPublic);
 
             retList.InsertRange(retList.Count - 1, new List<CodeInstruction>
             {

diff --git a/src/RustServerMetrics/HarmonyPatches/TimeWarning_Dispose_Patch.cs b/src/RustServerMetrics/HarmonyPatches/TimeWarning_Dispose_Patch.cs
@@ -0,0 +1,25 @@
+using HarmonyLib;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Reflection.Emit;
+
+namespace RustServerMetrics.HarmonyPatches
+{
+    [HarmonyPatch(typeof(TimeWarning), nameof(TimeWarning.Dispose))]
+    public static class TimeWarning_Dispose_Patch
+    {
+        [HarmonyTranspiler]
+        public static IEnumerable<CodeInstruction> Transpile(IEnumerable<CodeInstruction> originalInstructions)
+        {
+            var methodInfo = typeof(MetricsTimeWarning)
+                .GetMethod(nameof(MetricsTimeWarning.DisposeTimeWarning), BindingFlags.Static | BindingFlags.Public);
+
+            return new CodeInstruction[]
+            {
+                new CodeInstruction(OpCodes.Ldarg_0),
+                new CodeInstruction(OpCodes.Call, methodInfo),
+                new CodeInstruction(OpCodes.Ret)
+            };
+        }
+    }
+}
diff --git a/src/RustServerMetrics/HarmonyPatches/TimeWarning_New_Patch.cs b/src/RustServerMetrics/HarmonyPatches/TimeWarning_New_Patch.cs
@@ -0,0 +1,26 @@
+using HarmonyLib;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Reflection.Emit;
+
+namespace RustServerMetrics.HarmonyPatches
+{
+    [HarmonyPatch(typeof(TimeWarning), nameof(TimeWarning.New))]
+    public static class TimeWarning_New_Patch
+    {
+        [HarmonyTranspiler]
+        public static IEnumerable<CodeInstruction> Transpile(IEnumerable<CodeInstruction> originalInstructions)
+        {
+            var methodInfo = typeof(MetricsTimeWarning)
+                .GetMethod(nameof(MetricsTimeWarning.GetTimeWarning), BindingFlags.Static | BindingFlags.Public);
+
+            return new List<CodeInstruction>
+            {
+                new CodeInstruction(OpCodes.Ldarg_0),
+                new CodeInstruction(OpCodes.Ldarg_1),
+                new CodeInstruction(OpCodes.Call, methodInfo),
+                new CodeInstruction(OpCodes.Ret)
+            };
+        }
+    }
+}