Deps Update, remove all remaining references to Oxide

Pinkstink-Rust · Feb 18, 2021 · 9d1d210 · 9d1d210
1 parent d1e1aa7
commit 9d1d210
Show file tree

Hide file tree

Showing 119 changed files with 87 additions and 48 deletions.
diff --git a/deps/Assembly-CSharp-firstpass.dll b/deps/Assembly-CSharp-firstpass.dll
diff --git a/deps/Assembly-CSharp.dll b/deps/Assembly-CSharp.dll
diff --git a/deps/CurvedTextMeshPro.dll b/deps/CurvedTextMeshPro.dll
diff --git a/deps/DelaunayER.dll b/deps/DelaunayER.dll
diff --git a/deps/EZhex1991.EZSoftBone.dll b/deps/EZhex1991.EZSoftBone.dll
diff --git a/deps/EasyRoads3Dv3.dll b/deps/EasyRoads3Dv3.dll
diff --git a/deps/Facepunch.Console.dll b/deps/Facepunch.Console.dll
diff --git a/deps/Facepunch.GoogleSheets.dll b/deps/Facepunch.GoogleSheets.dll
diff --git a/deps/Facepunch.Input.dll b/deps/Facepunch.Input.dll
diff --git a/deps/Facepunch.Network.dll b/deps/Facepunch.Network.dll
diff --git a/deps/Facepunch.Raknet.dll b/deps/Facepunch.Raknet.dll
diff --git a/deps/Facepunch.Rcon.dll b/deps/Facepunch.Rcon.dll
diff --git a/deps/Facepunch.Skeleton.dll b/deps/Facepunch.Skeleton.dll
diff --git a/deps/Facepunch.Sqlite.dll b/deps/Facepunch.Sqlite.dll
diff --git a/deps/Facepunch.SteamNetworking.dll b/deps/Facepunch.SteamNetworking.dll
diff --git a/deps/Facepunch.Steamworks.Posix.dll b/deps/Facepunch.Steamworks.Posix.dll
diff --git a/deps/Facepunch.Steamworks.Win64.dll b/deps/Facepunch.Steamworks.Win64.dll
diff --git a/deps/Facepunch.System.dll b/deps/Facepunch.System.dll
diff --git a/deps/Facepunch.Unity.dll b/deps/Facepunch.Unity.dll
diff --git a/deps/Facepunch.UnityEngine.dll b/deps/Facepunch.UnityEngine.dll
diff --git a/deps/MidiJack.dll b/deps/MidiJack.dll
diff --git a/deps/Mono.Data.Tds.dll b/deps/Mono.Data.Tds.dll
diff --git a/deps/MySql.Data.dll b/deps/MySql.Data.dll
diff --git a/deps/NewAssembly.dll b/deps/NewAssembly.dll
diff --git a/deps/Oxide.CSharp.dll b/deps/Oxide.CSharp.dll
diff --git a/deps/Oxide.Core.dll b/deps/Oxide.Core.dll
diff --git a/deps/Oxide.MySql.dll b/deps/Oxide.MySql.dll
diff --git a/deps/Oxide.References.dll b/deps/Oxide.References.dll
diff --git a/deps/Oxide.References.dll.config b/deps/Oxide.References.dll.config
diff --git a/deps/Oxide.Rust.dll b/deps/Oxide.Rust.dll
diff --git a/deps/Oxide.SQLite.dll b/deps/Oxide.SQLite.dll
diff --git a/deps/Oxide.Unity.dll b/deps/Oxide.Unity.dll
diff --git a/deps/Rust.Data.dll b/deps/Rust.Data.dll
diff --git a/deps/Rust.Demo.dll b/deps/Rust.Demo.dll
diff --git a/deps/Rust.Global.dll b/deps/Rust.Global.dll
diff --git a/deps/Rust.Harmony.dll b/deps/Rust.Harmony.dll
diff --git a/deps/Rust.Localization.dll b/deps/Rust.Localization.dll
diff --git a/deps/Rust.Platform.Common.dll b/deps/Rust.Platform.Common.dll
diff --git a/deps/Rust.Platform.Steam.dll b/deps/Rust.Platform.Steam.dll
diff --git a/deps/Rust.Platform.dll b/deps/Rust.Platform.dll
diff --git a/deps/Rust.UI.dll b/deps/Rust.UI.dll
diff --git a/deps/Rust.Workshop.dll b/deps/Rust.Workshop.dll
diff --git a/deps/Rust.World.dll b/deps/Rust.World.dll
diff --git a/deps/System.Configuration.Install.dll b/deps/System.Configuration.Install.dll
diff --git a/deps/System.Data.SQLite.dll b/deps/System.Data.SQLite.dll
diff --git a/deps/System.Data.SQLite.dll.config b/deps/System.Data.SQLite.dll.config
diff --git a/deps/System.Data.dll b/deps/System.Data.dll
diff --git a/deps/System.Drawing.dll b/deps/System.Drawing.dll
diff --git a/deps/System.Runtime.Serialization.dll b/deps/System.Runtime.Serialization.dll
diff --git a/deps/System.Transactions.dll b/deps/System.Transactions.dll
diff --git a/deps/Unity.TextMeshPro.dll b/deps/Unity.TextMeshPro.dll
diff --git a/deps/UnityEngine.AIModule.dll b/deps/UnityEngine.AIModule.dll
diff --git a/deps/UnityEngine.ARModule.dll b/deps/UnityEngine.ARModule.dll
diff --git a/deps/UnityEngine.AccessibilityModule.dll b/deps/UnityEngine.AccessibilityModule.dll
diff --git a/deps/UnityEngine.AndroidJNIModule.dll b/deps/UnityEngine.AndroidJNIModule.dll
diff --git a/deps/UnityEngine.AnimationModule.dll b/deps/UnityEngine.AnimationModule.dll
diff --git a/deps/UnityEngine.AssetBundleModule.dll b/deps/UnityEngine.AssetBundleModule.dll
diff --git a/deps/UnityEngine.AudioModule.dll b/deps/UnityEngine.AudioModule.dll
diff --git a/deps/UnityEngine.ClothModule.dll b/deps/UnityEngine.ClothModule.dll
diff --git a/deps/UnityEngine.ClusterInputModule.dll b/deps/UnityEngine.ClusterInputModule.dll
diff --git a/deps/UnityEngine.ClusterRendererModule.dll b/deps/UnityEngine.ClusterRendererModule.dll
diff --git a/deps/UnityEngine.CoreModule.dll b/deps/UnityEngine.CoreModule.dll
diff --git a/deps/UnityEngine.CrashReportingModule.dll b/deps/UnityEngine.CrashReportingModule.dll
diff --git a/deps/UnityEngine.DSPGraphModule.dll b/deps/UnityEngine.DSPGraphModule.dll
diff --git a/deps/UnityEngine.DirectorModule.dll b/deps/UnityEngine.DirectorModule.dll
diff --git a/deps/UnityEngine.GameCenterModule.dll b/deps/UnityEngine.GameCenterModule.dll
diff --git a/deps/UnityEngine.GridModule.dll b/deps/UnityEngine.GridModule.dll
diff --git a/deps/UnityEngine.HotReloadModule.dll b/deps/UnityEngine.HotReloadModule.dll
diff --git a/deps/UnityEngine.IMGUIModule.dll b/deps/UnityEngine.IMGUIModule.dll
diff --git a/deps/UnityEngine.ImageConversionModule.dll b/deps/UnityEngine.ImageConversionModule.dll
diff --git a/deps/UnityEngine.InputLegacyModule.dll b/deps/UnityEngine.InputLegacyModule.dll
diff --git a/deps/UnityEngine.InputModule.dll b/deps/UnityEngine.InputModule.dll
diff --git a/deps/UnityEngine.JSONSerializeModule.dll b/deps/UnityEngine.JSONSerializeModule.dll
diff --git a/deps/UnityEngine.LocalizationModule.dll b/deps/UnityEngine.LocalizationModule.dll
diff --git a/deps/UnityEngine.ParticleSystemModule.dll b/deps/UnityEngine.ParticleSystemModule.dll
diff --git a/deps/UnityEngine.PerformanceReportingModule.dll b/deps/UnityEngine.PerformanceReportingModule.dll
diff --git a/deps/UnityEngine.Physics2DModule.dll b/deps/UnityEngine.Physics2DModule.dll
diff --git a/deps/UnityEngine.PhysicsModule.dll b/deps/UnityEngine.PhysicsModule.dll
diff --git a/deps/UnityEngine.ProfilerModule.dll b/deps/UnityEngine.ProfilerModule.dll
diff --git a/deps/UnityEngine.ScreenCaptureModule.dll b/deps/UnityEngine.ScreenCaptureModule.dll
diff --git a/deps/UnityEngine.SharedInternalsModule.dll b/deps/UnityEngine.SharedInternalsModule.dll
diff --git a/deps/UnityEngine.SpriteMaskModule.dll b/deps/UnityEngine.SpriteMaskModule.dll
diff --git a/deps/UnityEngine.SpriteShapeModule.dll b/deps/UnityEngine.SpriteShapeModule.dll
diff --git a/deps/UnityEngine.StreamingModule.dll b/deps/UnityEngine.StreamingModule.dll
diff --git a/deps/UnityEngine.SubstanceModule.dll b/deps/UnityEngine.SubstanceModule.dll
diff --git a/deps/UnityEngine.SubsystemsModule.dll b/deps/UnityEngine.SubsystemsModule.dll
diff --git a/deps/UnityEngine.TLSModule.dll b/deps/UnityEngine.TLSModule.dll
diff --git a/deps/UnityEngine.TerrainModule.dll b/deps/UnityEngine.TerrainModule.dll
diff --git a/deps/UnityEngine.TerrainPhysicsModule.dll b/deps/UnityEngine.TerrainPhysicsModule.dll
diff --git a/deps/UnityEngine.TextCoreModule.dll b/deps/UnityEngine.TextCoreModule.dll
diff --git a/deps/UnityEngine.TextRenderingModule.dll b/deps/UnityEngine.TextRenderingModule.dll
diff --git a/deps/UnityEngine.TilemapModule.dll b/deps/UnityEngine.TilemapModule.dll
diff --git a/deps/UnityEngine.UI.dll b/deps/UnityEngine.UI.dll
diff --git a/deps/UnityEngine.UIElementsModule.dll b/deps/UnityEngine.UIElementsModule.dll
diff --git a/deps/UnityEngine.UIModule.dll b/deps/UnityEngine.UIModule.dll
diff --git a/deps/UnityEngine.UNETModule.dll b/deps/UnityEngine.UNETModule.dll
diff --git a/deps/UnityEngine.UmbraModule.dll b/deps/UnityEngine.UmbraModule.dll
diff --git a/deps/UnityEngine.UnityAnalyticsModule.dll b/deps/UnityEngine.UnityAnalyticsModule.dll
diff --git a/deps/UnityEngine.UnityConnectModule.dll b/deps/UnityEngine.UnityConnectModule.dll
diff --git a/deps/UnityEngine.UnityTestProtocolModule.dll b/deps/UnityEngine.UnityTestProtocolModule.dll
diff --git a/deps/UnityEngine.UnityWebRequestAssetBundleModule.dll b/deps/UnityEngine.UnityWebRequestAssetBundleModule.dll
diff --git a/deps/UnityEngine.UnityWebRequestAudioModule.dll b/deps/UnityEngine.UnityWebRequestAudioModule.dll
diff --git a/deps/UnityEngine.UnityWebRequestModule.dll b/deps/UnityEngine.UnityWebRequestModule.dll
diff --git a/deps/UnityEngine.UnityWebRequestTextureModule.dll b/deps/UnityEngine.UnityWebRequestTextureModule.dll
diff --git a/deps/UnityEngine.UnityWebRequestWWWModule.dll b/deps/UnityEngine.UnityWebRequestWWWModule.dll
diff --git a/deps/UnityEngine.VFXModule.dll b/deps/UnityEngine.VFXModule.dll
diff --git a/deps/UnityEngine.VRModule.dll b/deps/UnityEngine.VRModule.dll
diff --git a/deps/UnityEngine.VehiclesModule.dll b/deps/UnityEngine.VehiclesModule.dll
diff --git a/deps/UnityEngine.VideoModule.dll b/deps/UnityEngine.VideoModule.dll
diff --git a/deps/UnityEngine.WindModule.dll b/deps/UnityEngine.WindModule.dll
diff --git a/deps/UnityEngine.XRModule.dll b/deps/UnityEngine.XRModule.dll
diff --git a/deps/UnityEngine.dll b/deps/UnityEngine.dll
diff --git a/deps/com.unity.postprocessing.Runtime.dll b/deps/com.unity.postprocessing.Runtime.dll
diff --git a/src/RustServerMetrics/Harmony/NetWrite/PacketID_Patch.cs b/src/RustServerMetrics/Harmony/NetWrite/PacketID_Patch.cs
@@ -1,8 +1,5 @@
 using Harmony;
-using Network;
-using Oxide.Core;
 using System.Collections.Generic;
-using System.Linq;
 using System.Reflection.Emit;
 
 namespace RustServerMetrics.Harmony.NetWrite

diff --git a/src/RustServerMetrics/Harmony/NetWrite/Send_Patch.cs b/src/RustServerMetrics/Harmony/NetWrite/Send_Patch.cs
@@ -1,9 +1,5 @@
 using Harmony;
-using Network;
-using Oxide.Core;
-using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Reflection.Emit;
 
 namespace RustServerMetrics.Harmony.NetWrite

diff --git a/src/RustServerMetrics/Harmony/TimeWarning/Dispose_Patch.cs b/src/RustServerMetrics/Harmony/TimeWarning/Dispose_Patch.cs
@@ -0,0 +1,28 @@
+using Harmony;
+using System.Collections.Generic;
+using System.Reflection.Emit;
+
+namespace RustServerMetrics.Harmony.TimeWarning
+{
+    [HarmonyPatch(typeof(global::TimeWarning), nameof(global::TimeWarning.Dispose))]
+    public static class Dispose_Patch
+    {
+        [HarmonyTranspiler]
+        public static IEnumerable<CodeInstruction> Transpile(IEnumerable<CodeInstruction> originalInstructions)
+        {
+            var fieldInfo = typeof(SingletonComponent<MetricsLogger>)
+                .GetField(nameof(SingletonComponent<MetricsLogger>.Instance), System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.Public);
+
+            var methodInfo = typeof(MetricsLogger)
+                .GetMethod(nameof(MetricsLogger.OnDisposeTimeWarning), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
+
+            return new CodeInstruction[]
+            {
+                new CodeInstruction(OpCodes.Ldsfld, fieldInfo),
+                new CodeInstruction(OpCodes.Ldarg_0),
+                new CodeInstruction(OpCodes.Call, methodInfo),
+                new CodeInstruction(OpCodes.Ret)
+            };
+        }
+    }
+}
diff --git a/src/RustServerMetrics/Harmony/TimeWarning/New_Patch.cs b/src/RustServerMetrics/Harmony/TimeWarning/New_Patch.cs
@@ -0,0 +1,29 @@
+using Harmony;
+using System.Collections.Generic;
+using System.Reflection.Emit;
+
+namespace RustServerMetrics.Harmony.TimeWarning
+{
+    [HarmonyPatch(typeof(global::TimeWarning), nameof(global::TimeWarning.New))]
+    public static class New_Patch
+    {
+        [HarmonyTranspiler]
+        public static IEnumerable<CodeInstruction> Transpile(IEnumerable<CodeInstruction> originalInstructions)
+        {
+            var fieldInfo = typeof(SingletonComponent<MetricsLogger>)
+                .GetField(nameof(SingletonComponent<MetricsLogger>.Instance), System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.Public);
+
+            var methodInfo = typeof(MetricsLogger)
+                .GetMethod(nameof(MetricsLogger.OnNewTimeWarning), System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
+
+            return new List<CodeInstruction>
+            {
+                new CodeInstruction(OpCodes.Ldsfld, fieldInfo),
+                new CodeInstruction(OpCodes.Ldarg_0),
+                new CodeInstruction(OpCodes.Ldarg_1),
+                new CodeInstruction(OpCodes.Call, methodInfo),
+                new CodeInstruction(OpCodes.Ret)
+            };
+        }
+    }
+}
diff --git a/src/RustServerMetrics/MetricsLogger.cs b/src/RustServerMetrics/MetricsLogger.cs
@@ -2,20 +2,17 @@
 using Newtonsoft.Json;
 using RustServerMetrics.Config;
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 using UnityEngine;
 
 namespace RustServerMetrics
 {
     public class MetricsLogger : SingletonComponent<MetricsLogger>
     {
         const string CONFIGURATION_PATH = "HarmonyMods_Data/ServerMetrics/Configuration.json";
-        const string COMMAND_PREFIX = "servermetrics";
         readonly StringBuilder _stringBuilder = new StringBuilder();
         readonly Dictionary<ulong, Action> _playerStatsActions = new Dictionary<ulong, Action>();
         readonly Dictionary<Message.Type, int> _networkUpdates = new Dictionary<Message.Type, int>();
@@ -73,17 +70,25 @@ override protected void Awake()
 
         void RegisterCommands()
         {
+            const string commandPrefix = "servermetrics";
             ConsoleSystem.Command reloadCommand = new ConsoleSystem.Command()
             {
                 Name = "reload",
-                Parent = COMMAND_PREFIX,
-                FullName = COMMAND_PREFIX + "." + "reload",
+                Parent = commandPrefix,
+                FullName = commandPrefix + "." + "reload",
                 ServerAdmin = true,
                 Variable = false,
                 Call = new Action<ConsoleSystem.Arg>(ReloadCommand)
             };
-            ConsoleSystem.Index.Server.Dict[COMMAND_PREFIX + "." + "reload"] = reloadCommand;
-            ConsoleSystem.Index.All = ConsoleSystem.Index.Server.Dict.Values.ToArray();
+
+            ConsoleSystem.Index.Server.Dict[commandPrefix + "." + "reload"] = reloadCommand;
+            var allCommands = ConsoleSystem.Index.All;
+            Array.Resize(ref allCommands, allCommands.Length + 1);
+            allCommands[allCommands.Length - 1] = reloadCommand;
+            // Would be nice if this had a public setter, or better yet, a register command helper
+            typeof(ConsoleSystem.Index)
+                .GetProperty(nameof(ConsoleSystem.Index.All), System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Static)
+                .SetValue(null, allCommands);
         }
 
         private void ReloadCommand(ConsoleSystem.Arg arg)
@@ -300,6 +305,19 @@ internal void OnPerformanceReportGenerated()
             _reportUploader.AddToSendBuffer(_stringBuilder.ToString());
         }
 
+        // This method presently does nothing as we are awaiting a Harmony2 upgrade from Facepunch
+        internal TimeWarning OnNewTimeWarning(string name, int maxmilliseconds)
+        {
+            Debug.Log("OnNewTimeWarning: " + name);
+            return null;
+        }
+
+        // This method presently does nothing as we are awaiting a Harmony2 upgrade from Facepunch
+        internal void OnDisposeTimeWarning(TimeWarning instance)
+        {
+            Debug.Log("OnTimeWarningDispose");
+        }
+
         bool ValidateConfiguration()
         {
             if (_configuration == null) return false;

diff --git a/src/RustServerMetrics/RustServerMetrics.csproj b/src/RustServerMetrics/RustServerMetrics.csproj
@@ -61,9 +61,6 @@
     <Reference Include="CurvedTextMeshPro">
       <HintPath>..\..\deps\CurvedTextMeshPro.dll</HintPath>
     </Reference>
-    <Reference Include="DryWetMidi">
-      <HintPath>..\..\deps\DryWetMidi.dll</HintPath>
-    </Reference>
     <Reference Include="EasyAntiCheat.Client">
       <HintPath>..\..\deps\EasyAntiCheat.Client.dll</HintPath>
     </Reference>
@@ -100,9 +97,6 @@
     <Reference Include="Facepunch.SteamNetworking">
       <HintPath>..\..\deps\Facepunch.SteamNetworking.dll</HintPath>
     </Reference>
-    <Reference Include="Facepunch.Steamworks.Posix">
-      <HintPath>..\..\deps\Facepunch.Steamworks.Posix.dll</HintPath>
-    </Reference>
     <Reference Include="Facepunch.System">
       <HintPath>..\..\deps\Facepunch.System.dll</HintPath>
     </Reference>
@@ -115,26 +109,9 @@
     <Reference Include="NewAssembly">
       <HintPath>..\..\deps\NewAssembly.dll</HintPath>
     </Reference>
-    <Reference Include="Oxide.Core">
-      <HintPath>..\..\deps\Oxide.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Oxide.CSharp">
-      <HintPath>..\..\deps\Oxide.CSharp.dll</HintPath>
-    </Reference>
-    <Reference Include="Oxide.MySql">
-      <HintPath>..\..\deps\Oxide.MySql.dll</HintPath>
-    </Reference>
-    <Reference Include="Oxide.References">
-      <HintPath>..\..\deps\Oxide.References.dll</HintPath>
-    </Reference>
-    <Reference Include="Oxide.Rust">
-      <HintPath>..\..\deps\Oxide.Rust.dll</HintPath>
-    </Reference>
-    <Reference Include="Oxide.SQLite">
-      <HintPath>..\..\deps\Oxide.SQLite.dll</HintPath>
-    </Reference>
-    <Reference Include="Oxide.Unity">
-      <HintPath>..\..\deps\Oxide.Unity.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\Vital-Shared\deps\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Rust.Data">
       <HintPath>..\..\deps\Rust.Data.dll</HintPath>
@@ -366,6 +343,8 @@
     <Compile Include="Harmony\NetWrite\Send_Patch.cs" />
     <Compile Include="Harmony\NetWrite\PacketID_Patch.cs" />
     <Compile Include="Harmony\Performance\FPSTimer_Patch.cs" />
+    <Compile Include="Harmony\TimeWarning\Dispose_Patch.cs" />
+    <Compile Include="Harmony\TimeWarning\New_Patch.cs" />
     <Compile Include="MetricsLogger.cs" />
     <Compile Include="ReportUploader.cs" />
   </ItemGroup>