Remove reliance on Aki.Common

KeiranY · Jul 29, 2021 · 86f0f5f · 86f0f5f
1 parent 476435b
commit 86f0f5f
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 20 deletions.
diff --git a/TarkovLoader/Base.cs b/TarkovLoader/Base.cs
@@ -103,6 +103,7 @@ void LoadMod(string dllPath)
                 log.Error(e.Message + '\n' + e.StackTrace);
             }
         }
+
 
     }
 
@@ -114,4 +115,17 @@ abstract public class BaseLog
         public Action<string> Warn;
         public Action<string> Error;
     }
+
+    public class NLogLog : BaseLog
+    {
+        private static readonly NLog.Logger Logger = NLog.LogManager.GetLogger("application");
+
+        public NLogLog()
+        {
+            Debug = new Action<string>((msg) => Logger.Debug(msg));
+            Info = new Action<string>((msg) => Logger.Info(msg));
+            Warn = new Action<string>((msg) => Logger.Warn(msg));
+            Error = new Action<string>((msg) => Logger.Error(msg));
+        }
+    }
 }
diff --git a/TarkovLoader/SPTLoader.cs b/TarkovLoader/SPTLoader.cs
@@ -11,7 +11,7 @@ public class SPTLoader
 {
     private static void Main()
     {
-        var Log = new SPTLog();
+        var Log = new NLogLog();
 
         string folder = "";
         // Search mods folder for module.dlls
@@ -45,20 +45,16 @@ private static void Main()
     }
 }
 
-public class SPTLog : BaseLog
-{
-    public SPTLog()
-    {
-        Console.WriteLine("test");
-        var log = Assembly.LoadFrom(@"EscapeFromTarkov_Data\Managed\Aki.Common.dll").GetType("Aki.Common.Log");
-        Debug = new Action<string>((msg) => log.GetMethod("Write").Invoke(null, new System.Object[] { msg }));
-        Info = new Action<string>((msg) => log.GetMethod("Info").Invoke(null, new System.Object[] { msg }));
-        Warn = new Action<string>((msg) => log.GetMethod("Warning").Invoke(null, new System.Object[] { msg }));
-        Error = new Action<string>((msg) => log.GetMethod("Error").Invoke(null, new System.Object[] { msg }));
-        //Debug = (Action<string>)Delegate.CreateDelegate(log, log.GetMethod("Write"));
-        //Info = (Action<string>)Delegate.CreateDelegate(log, log.GetMethod("Info"));
-        //Warn = (Action<string>)Delegate.CreateDelegate(log, log.GetMethod("Warning"));
-        //Error = (Action<string>)Delegate.CreateDelegate(log, log.GetMethod("Error"));
-    }
-}
+//public class SPTLog : BaseLog
+//{
+//    public SPTLog()
+//    {
+//        Console.WriteLine("test");
+//        var log = Assembly.LoadFrom(@"EscapeFromTarkov_Data\Managed\Aki.Common.dll").GetType("Aki.Common.Log");
+//        Debug = new Action<string>((msg) => log.GetMethod("Write").Invoke(null, new System.Object[] { msg }));
+//        Info = new Action<string>((msg) => log.GetMethod("Info").Invoke(null, new System.Object[] { msg }));
+//        Warn = new Action<string>((msg) => log.GetMethod("Warning").Invoke(null, new System.Object[] { msg }));
+//        Error = new Action<string>((msg) => log.GetMethod("Error").Invoke(null, new System.Object[] { msg }));
+//    }
+//}
 
diff --git a/TarkovLoader/TarkovLoader.csproj b/TarkovLoader/TarkovLoader.csproj
@@ -31,9 +31,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Aki.Common">
-      <HintPath>..\..\..\..\..\..\Games\SP Tarkov not bleedin\EscapeFromTarkov_Data\Managed\Aki.Common.dll</HintPath>
-    </Reference>
     <Reference Include="Assembly-CSharp">
       <HintPath>..\..\..\..\..\..\Games\SP Tarkov not bleedin\EscapeFromTarkov_Data\Managed\Assembly-CSharp.dll</HintPath>
     </Reference>
@@ -43,6 +40,10 @@
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\..\..\..\..\..\Games\SP Tarkov not bleedin\EscapeFromTarkov_Data\Managed\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\Games\SP Tarkov not bleedin\EscapeFromTarkov_Data\Managed\NLog.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />