Fix DS loading, add NLog for logging

Author: Jimmacle

TestPlugin/Class1.cs

@@ -15,19 +15,19 @@ public class Plugin : TorchPluginBase
         public override void Init(ITorchBase torch)
         {
             base.Init(torch);
-            Torch.Log.Write($"Plugin init {Name}");
+            //Torch.Log.Write($"Plugin init {Name}");
         }
 
         /// <inheritdoc />
         public override void Update()
         {
-            Torch.Log.Write($"Plugin update {Name}");
+            //Torch.Log.Write($"Plugin update {Name}");
         }
 
         /// <inheritdoc />
         public override void Unload()
         {
-            Torch.Log.Write($"Plugin unload {Name}");
+            //Torch.Log.Write($"Plugin unload {Name}");
         }
     }
 }

Torch.API/ILogger.cs

@@ -9,5 +9,6 @@ public interface IPluginManager : IEnumerable<ITorchPlugin>
     {
         void UpdatePlugins();
         void LoadPlugins();
+        void UnloadPlugins();
     }
 }

Torch.API/IPluginManager.cs

@@ -11,7 +11,6 @@ public interface ITorchBase
         event Action SessionLoaded;
         IMultiplayer Multiplayer { get; }
         IPluginManager Plugins { get; }
-        ILogger Log { get; set; }
         void Invoke(Action action);
         void InvokeBlocking(Action action);
         Task InvokeAsync(Action action);

Torch.API/ITorchBase.cs

@@ -13,8 +13,20 @@ public interface ITorchPlugin
         Version Version { get; }
         string Name { get; }
 
+        /// <summary>
+        /// Called when the game is initialized.
+        /// </summary>
+        /// <param name="torchBase"></param>
         void Init(ITorchBase torchBase);
+
+        /// <summary>
+        /// Called after each game tick. Not thread safe, use invocation methods in <see cref="ITorchBase"/>.
+        /// </summary>
         void Update();
+
+        /// <summary>
+        /// Called when the game exits.
+        /// </summary>
         void Unload();
     }
 }

Torch.API/ITorchPlugin.cs

@@ -32,10 +32,18 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="NLog">
+      <HintPath>..\packages\NLog.4.4.1\lib\net45\NLog.dll</HintPath>
+    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -53,7 +61,6 @@
   <ItemGroup>
     <Compile Include="ConnectionState.cs" />
     <Compile Include="IChatItem.cs" />
-    <Compile Include="ILogger.cs" />
     <Compile Include="IMultiplayer.cs" />
     <Compile Include="IPlayer.cs" />
     <Compile Include="IPluginManager.cs" />
@@ -63,6 +70,9 @@
     <Compile Include="PluginAttribute.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

Torch.API/Torch.API.csproj

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NLog" version="4.4.1" targetFramework="net461" />
+</packages>

Torch.API/packages.config

@@ -37,6 +37,10 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.4.4.1\lib\net45\NLog.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Sandbox.Game">
       <HintPath>C:\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\Sandbox.Game.dll</HintPath>
     </Reference>
@@ -108,6 +112,7 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>

Torch.Client/Torch.Client.csproj

@@ -85,16 +85,14 @@ public override void Start()
         {
             using (var spaceEngineersGame = new SpaceEngineersGame(_services, RunArgs))
             {
-                Log.Write("Starting client...");
+                Log.Info("Starting client");
                 spaceEngineersGame.OnGameLoaded += SpaceEngineersGame_OnGameLoaded;
                 spaceEngineersGame.Run();
             }
         }
 
         private void SpaceEngineersGame_OnGameLoaded(object sender, EventArgs e)
         {
-            Log.Write("Loading plugins");
-            Plugins.LoadAllPlugins();
         }
 
         public override void Stop()

Torch.Client/TorchClient.cs

@@ -28,10 +28,9 @@ public sealed override void RecreateControls(bool constructor)
                 VisibleRowsCount = 10,
             };
 
-            foreach (var plugin in TorchBase.Instance.Plugins.Plugins)
+            foreach (var plugin in TorchBase.Instance.Plugins)
             {
-                var name = TorchBase.Instance.Plugins.GetPluginName(plugin.GetType());
-                pluginList.Items.Add(new MyGuiControlListbox.Item(new StringBuilder(name)));
+                pluginList.Items.Add(new MyGuiControlListbox.Item(new StringBuilder(plugin.Name)));
             }
             Controls.Add(pluginList);
         }