remove harmony2 requirement

Pinkstink-Rust · Feb 24, 2021 · dd8a110 · dd8a110
1 parent a3ed07a
commit dd8a110
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 24 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/HarmonyPatches/BasePlayer_OnDisconnected_Patch.cs b/src/RustServerMetrics/HarmonyPatches/BasePlayer_OnDisconnected_Patch.cs
@@ -1,4 +1,4 @@
-using HarmonyLib;
+using Harmony;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Reflection.Emit;
@@ -19,7 +19,7 @@ public static IEnumerable<CodeInstruction> Transpile(IEnumerable<CodeInstruction
             var methodInfo = typeof(MetricsLogger)
                 .GetMethod(nameof(MetricsLogger.OnPlayerDisconnected), BindingFlags.Instance | BindingFlags.NonPublic);
 
-            retList.InsertRange(0, new List<CodeInstruction>
+            retList.InsertRange(0, new CodeInstruction[]
             {
                 new CodeInstruction(OpCodes.Ldsfld, fieldInfo),
                 new CodeInstruction(OpCodes.Ldarg_0),

diff --git a/src/RustServerMetrics/HarmonyPatches/BasePlayer_PlayerInit_Patch.cs b/src/RustServerMetrics/HarmonyPatches/BasePlayer_PlayerInit_Patch.cs
@@ -1,4 +1,4 @@
-using HarmonyLib;
+using Harmony;
 using System;
 using System.Collections.Generic;
 using System.Reflection;
@@ -24,7 +24,7 @@ public static IEnumerable<CodeInstruction> Transpile(IEnumerable<CodeInstruction
 
             if (idx < 0) throw new Exception("Failed to find the insertion index for PlayerInit");
 
-            retList.InsertRange(idx, new List<CodeInstruction>
+            retList.InsertRange(idx, new CodeInstruction[]
             {
                 new CodeInstruction(OpCodes.Ldsfld, fieldInfo),
                 new CodeInstruction(OpCodes.Ldarg_0),

diff --git a/src/RustServerMetrics/HarmonyPatches/Bootstrap_StartServer_Patch.cs b/src/RustServerMetrics/HarmonyPatches/Bootstrap_StartServer_Patch.cs
@@ -1,4 +1,4 @@
-using HarmonyLib;
+using Harmony;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Reflection.Emit;
@@ -16,7 +16,7 @@ public static IEnumerable<CodeInstruction> Transpile(IEnumerable<CodeInstruction
             var methodInfo = typeof(MetricsLogger)
                 .GetMethod(nameof(MetricsLogger.Initialize), BindingFlags.Static | BindingFlags.NonPublic);
 
-            retList.InsertRange(0, new List<CodeInstruction>
+            retList.InsertRange(0, new CodeInstruction[]
             {
                 new CodeInstruction(OpCodes.Call, methodInfo)
             });

diff --git a/src/RustServerMetrics/HarmonyPatches/NetWrite_PacketID_Patch.cs b/src/RustServerMetrics/HarmonyPatches/NetWrite_PacketID_Patch.cs
@@ -1,4 +1,4 @@
-using HarmonyLib;
+using Harmony;
 using Network;
 using System.Collections.Generic;
 using System.Reflection;
@@ -20,7 +20,7 @@ public static IEnumerable<CodeInstruction> Transpile(IEnumerable<CodeInstruction
             var methodInfo = typeof(MetricsLogger)
                 .GetMethod(nameof(MetricsLogger.OnNetWritePacketID), BindingFlags.Instance | BindingFlags.NonPublic);
 
-            retList.InsertRange(retList.Count - 1, new List<CodeInstruction>
+            retList.InsertRange(retList.Count - 1, new CodeInstruction[]
             {
                 new CodeInstruction(OpCodes.Ldsfld, fieldInfo),
                 new CodeInstruction(OpCodes.Ldarg_1),

diff --git a/src/RustServerMetrics/HarmonyPatches/NetWrite_Send_Patch.cs b/src/RustServerMetrics/HarmonyPatches/NetWrite_Send_Patch.cs
@@ -1,4 +1,4 @@
-using HarmonyLib;
+using Harmony;
 using Network;
 using System.Collections.Generic;
 using System.Reflection;
@@ -20,7 +20,7 @@ public static IEnumerable<CodeInstruction> Transpile(IEnumerable<CodeInstruction
             var methodInfo = typeof(MetricsLogger)
                 .GetMethod(nameof(MetricsLogger.OnNetWriteSend), BindingFlags.Instance | BindingFlags.NonPublic);
 
-            retList.InsertRange(retList.Count - 1, new List<CodeInstruction>
+            retList.InsertRange(retList.Count - 1, new CodeInstruction[]
             {
                 new CodeInstruction(OpCodes.Ldsfld, fieldInfo),
                 new CodeInstruction(OpCodes.Ldarg_1),

diff --git a/src/RustServerMetrics/HarmonyPatches/Performance_FPSTimer_Patch.cs b/src/RustServerMetrics/HarmonyPatches/Performance_FPSTimer_Patch.cs
@@ -1,4 +1,4 @@
-using HarmonyLib;
+using Harmony;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Reflection.Emit;
@@ -19,7 +19,7 @@ public static IEnumerable<CodeInstruction> Transpile(IEnumerable<CodeInstruction
             var methodInfo = typeof(MetricsLogger)
                 .GetMethod(nameof(MetricsLogger.OnPerformanceReportGenerated), BindingFlags.Instance | BindingFlags.NonPublic);
 
-            retList.InsertRange(retList.Count - 1, new List<CodeInstruction>
+            retList.InsertRange(retList.Count - 1, new CodeInstruction[]
             {
                 new CodeInstruction(OpCodes.Ldsfld, fieldInfo),
                 new CodeInstruction(OpCodes.Call, methodInfo)

diff --git a/src/RustServerMetrics/HarmonyPatches/TimeWarning_Dispose_Patch.cs b/src/RustServerMetrics/HarmonyPatches/TimeWarning_Dispose_Patch.cs
@@ -1,11 +1,11 @@
-using HarmonyLib;
+using Harmony;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Reflection.Emit;
 
 namespace RustServerMetrics.HarmonyPatches
 {
-    [HarmonyPatch(typeof(TimeWarning), nameof(TimeWarning.Dispose))]
+    //[HarmonyPatch(typeof(TimeWarning), nameof(TimeWarning.Dispose))]
     public static class TimeWarning_Dispose_Patch
     {
         [HarmonyTranspiler]

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

diff --git a/src/RustServerMetrics/MetricsLogger.cs b/src/RustServerMetrics/MetricsLogger.cs
@@ -110,7 +110,7 @@ void StatusCommand(ConsoleSystem.Arg arg)
             _stringBuilder.AppendLine("[ServerMetrics]: Status");
             _stringBuilder.AppendLine("Overview");
             _stringBuilder.Append("\tReady: "); _stringBuilder.Append(Ready); _stringBuilder.AppendLine();
-            _stringBuilder.AppendLine("Report Uploader:");
+            _stringBuilder.AppendLine("Report Uploader:"); 
             _stringBuilder.Append("\tRunning: "); _stringBuilder.Append(_reportUploader.IsRunning); _stringBuilder.AppendLine();
             _stringBuilder.Append("\tIn Buffer: "); _stringBuilder.Append(_reportUploader.BufferSize); _stringBuilder.AppendLine();
 
@@ -331,8 +331,6 @@ internal void OnPerformanceReportGenerated()
             _reportUploader.AddToSendBuffer(_stringBuilder.ToString());
         }
 
-        internal TimeWarning OnNewTimeWarning(string name, int maxMilliseconds) => MetricsTimeWarning.GetTimeWarning(name, maxMilliseconds);
-
         bool ValidateConfiguration()
         {
             if (_configuration == null) return false;

diff --git a/src/RustServerMetrics/RustServerMetrics.csproj b/src/RustServerMetrics/RustServerMetrics.csproj
@@ -37,10 +37,7 @@
   </Target>
   <ItemGroup>
     <Reference Include="0Harmony">
-      <HintPath>..\..\harmony2_override\0Harmony.dll</HintPath>
-    </Reference>
-    <Reference Include="Rust.Harmony">
-      <HintPath>..\..\harmony2_override\Rust.Harmony.dll</HintPath>
+      <HintPath>..\..\deps\0Harmony.dll</HintPath>
     </Reference>
     <Reference Include="Accessibility" />
     <Reference Include="ApexAI">