Refactoring, fixes, remove DisposeHelper

Dev4Unt · Jul 10, 2023 · d4523f0 · d4523f0
1 parent 4bc2997
commit d4523f0
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 72 deletions.
diff --git a/src/RocketPluginHelper/Helpers/CSteamIdHelper.cs b/src/RocketPluginHelper/Helpers/CSteamIdHelper.cs
diff --git a/src/RocketPluginHelper/Helpers/DisposeHelper.cs b/src/RocketPluginHelper/Helpers/DisposeHelper.cs
diff --git a/src/RocketPluginHelper/Helpers/SteamIdHelper.cs b/src/RocketPluginHelper/Helpers/SteamIdHelper.cs
@@ -0,0 +1,34 @@
+namespace RocketPluginHelper.Helpers;
+
+[UsedImplicitly(ImplicitUseTargetFlags.WithMembers)]
+public static class SteamIdHelper
+{
+    public static CSteamID GetSteamId(this IRocketPlayer source)
+    {
+        if (source is UnturnedPlayer unturnedPlayer)
+        {
+            return unturnedPlayer.CSteamID;
+        }
+        return Provider.server;
+    }
+    public static CSteamID GetSteamId(this Player source)
+    {
+        return source.channel.owner.GetSteamId();
+    }
+    public static CSteamID GetSteamId(this SteamPlayer source)
+    {
+        return source.playerID.steamID;
+    }
+    public static string GetStringSteamId(this Player source)
+    {
+        return source.channel.owner.GetStringSteamId();
+    }
+    public static string GetStringSteamId(this SteamPlayer source)
+    {
+        return source.playerID.steamID.GetStringSteamId();
+    }
+    public static string GetStringSteamId(this CSteamID source)
+    {
+        return source.m_SteamID.ToString();
+    }
+}
diff --git a/src/RocketPluginHelper/RocketPluginHelper.csproj b/src/RocketPluginHelper/RocketPluginHelper.csproj
@@ -10,7 +10,6 @@
 
   <ItemGroup>
     <PackageReference Include="Nito.AsyncEx.Context" Version="5.1.2"/>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.24"/>
     <PackageReference Include="RocketMod.Modern.Dependencies" Version="1.1.2.5" PrivateAssets="true"/>
     <PackageReference Include="OpenMod.UniTask" Version="*">
       <IncludeAssets>compile</IncludeAssets>